From 1f96330e67da62d2e5d59aa59b1ac66d586f816b Mon Sep 17 00:00:00 2001 From: Nathan Chapman Date: Sat, 30 Apr 2022 10:23:02 -0600 Subject: [PATCH] Fixes and updates --- src/core/migrations/0007_product_subtitle.py | 18 ++++++++++++++++++ src/core/models.py | 1 + src/storefront/templates/storefront/about.html | 4 ++-- .../templates/storefront/contact_form.html | 2 +- .../templates/storefront/product_detail.html | 1 + .../templates/storefront/product_list.html | 1 + src/templates/base.html | 10 ++++++---- 7 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 src/core/migrations/0007_product_subtitle.py diff --git a/src/core/migrations/0007_product_subtitle.py b/src/core/migrations/0007_product_subtitle.py new file mode 100644 index 0000000..2d98dce --- /dev/null +++ b/src/core/migrations/0007_product_subtitle.py @@ -0,0 +1,18 @@ +# Generated by Django 4.0.2 on 2022-04-30 15:52 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0006_alter_order_options_order_shipping_total'), + ] + + operations = [ + migrations.AddField( + model_name='product', + name='subtitle', + field=models.CharField(blank=True, max_length=250), + ), + ] diff --git a/src/core/models.py b/src/core/models.py index dabd4df..1141f51 100644 --- a/src/core/models.py +++ b/src/core/models.py @@ -42,6 +42,7 @@ class ProductManager(models.Manager): class Product(models.Model): name = models.CharField(max_length=250) + subtitle = models.CharField(max_length=250, blank=True) description = models.TextField(blank=True) sku = models.CharField(max_length=255, unique=True) price = models.DecimalField( diff --git a/src/storefront/templates/storefront/about.html b/src/storefront/templates/storefront/about.html index 7a50511..6f033b9 100644 --- a/src/storefront/templates/storefront/about.html +++ b/src/storefront/templates/storefront/about.html @@ -10,10 +10,10 @@

We love coffee!

-

If you’ve found Port Townsend Coffee Roasting Co., you probably love coffee so much that you seek out the best tasting, Certified Fair Trade Organic coffees available.

+

If you’ve found Port Townsend Roasting Co., you probably love coffee so much that you seek out the best tasting, Certified Fair Trade Organic coffees available.

You’ve probably been around coffee for years, perhaps starting with Specialty Coffees in the 1980’s, and know your way around fairly well. How and where coffee is grown and harvested, how it’s roasted, how to brew it. You value fair, guaranteed wages for growers and sustainable stewardship of the land where it’s grown.

No matter how much you drink, if you’re like us, great coffee is an important perk in your life. You are not alone in this… coffee is the one of the world’s most heavily traded commodities. In addition to the impact it has as a crop on the economies of producing countries, the cafe and coffee house industry touches millions of lives everyday, worldwide, as well.

-

We love the place coffee takes in conversation, culture and commerce. We seek out the world’s rarest coffees for taste and consistency. We roast and blend coffees at Port Townsend Coffee Roasting Co. with the hope that you will enjoy every cup.

+

We love the place coffee takes in conversation, culture and commerce. We seek out the world’s rarest coffees for taste and consistency. We roast and blend coffees at Port Townsend Roasting Co. with the hope that you will enjoy every cup.

diff --git a/src/storefront/templates/storefront/contact_form.html b/src/storefront/templates/storefront/contact_form.html index 0f78139..6e5b12b 100644 --- a/src/storefront/templates/storefront/contact_form.html +++ b/src/storefront/templates/storefront/contact_form.html @@ -11,7 +11,7 @@

Problem with your online order or have a question?

Please contact us, we’re happy to help you over the phone
- (360) 385-5856 between 8:00 am and 10:00 pm Pacific Time. + (360) 385-5856 Mon-Fri between 9:00 am and 5:00 pm Pacific Time.

diff --git a/src/storefront/templates/storefront/product_detail.html b/src/storefront/templates/storefront/product_detail.html index d8145ba..3594102 100644 --- a/src/storefront/templates/storefront/product_detail.html +++ b/src/storefront/templates/storefront/product_detail.html @@ -19,6 +19,7 @@

{{product.name}}

+

{{product.subtitle}}

{{product.description}}

Fair trade

${{product.price}}

diff --git a/src/storefront/templates/storefront/product_list.html b/src/storefront/templates/storefront/product_list.html index e4b746c..cb21630 100644 --- a/src/storefront/templates/storefront/product_list.html +++ b/src/storefront/templates/storefront/product_list.html @@ -21,6 +21,7 @@

{{ product.name }}

+
{{ product.subtitle }}

{{product.description|truncatewords:20}}

${{product.price}} | {{product.weight.oz|floatformat}}oz

diff --git a/src/templates/base.html b/src/templates/base.html index 0900fd0..492562d 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -8,6 +8,7 @@ {% block head_title %}{% endblock %} Port Townsend Coffee + @@ -89,13 +90,14 @@

Problem with your online order or have a question?
Please contact us, we’re happy to help you over the phone at (360) 385-5856
- between 8:00 am and 10:00 pm Pacific Time.
+ Mon-Fri between 9:00 am and 5:00 pm Pacific Time.

854 East Park Ave. Suite 1, Port Townsend, WA 98368

- Copyright © 2016-{% now "Y" %} Better Living Food Company Inc.
- Contact | Fair Trade | Organic - + Better Living Food Company Inc.℠
+ Contact | Fair Trade | Organic +
+ Website by Nathan Chapman

Fair trade