diff --git a/Pipfile b/Pipfile index 6f56539..ab813a8 100644 --- a/Pipfile +++ b/Pipfile @@ -20,6 +20,7 @@ paypal-checkout-serversdk = "*" Pillow = "*" redis = "*" psycopg2 = "*" +usps-api = "*" [dev-packages] django-debug-toolbar = "*" diff --git a/Pipfile.lock b/Pipfile.lock index d83b1c7..f943a4c 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "f7ca5d3f9e367e3324d6fd9af8c1022cff36b1a999eb7afa232ac1af8404c62c" + "sha256": "0087f9e4fd44233bc6329f7a844a96ae4001ee9d173323e7a715c7295844163c" }, "pipfile-spec": 6, "requires": { @@ -32,6 +32,14 @@ "markers": "python_version >= '3.7'", "version": "==3.5.0" }, + "async-timeout": { + "hashes": [ + "sha256:2163e1640ddb52b7a8c80d0a67a08587e5d245cc9c553a74a847056bc2976b15", + "sha256:8ca1e4fcf50d07413d66d1a5e416e42cfdf5851c981d679a09851a6853383b3c" + ], + "markers": "python_version >= '3.6'", + "version": "==4.0.2" + }, "billiard": { "hashes": [ "sha256:299de5a8da28a783d51b197d496bef4f1595dd023a93a4f59dde1886ae905547", @@ -44,11 +52,11 @@ "redis" ], "hashes": [ - "sha256:8aacd02fc23a02760686d63dde1eb0daa9f594e735e73ea8fb15c2ff15cb608c", - "sha256:e2cd41667ad97d4f6a2f4672d1c6a6ebada194c619253058b5f23704aaadaa82" + "sha256:d1398cadf30f576266b34370e28e880306ec55f7a4b6307549b0ae9c15663481", + "sha256:da31f8eae7607b1582e5ee2d3f2d6f58450585afd23379491e3d9229d08102d0" ], "index": "pypi", - "version": "==5.2.3" + "version": "==5.2.6" }, "certifi": { "hashes": [ @@ -201,10 +209,10 @@ }, "django-allauth": { "hashes": [ - "sha256:f5fbb67376177c6a9276516dde98bcb01ac4160a5a27f7b340914dd521d04f12" + "sha256:ee3a174e249771caeb1d037e64b2704dd3c56cfec44f2058fae2214b224d35e8" ], "index": "pypi", - "version": "==0.49.0" + "version": "==0.50.0" }, "django-anymail": { "extras": [ @@ -321,6 +329,73 @@ "markers": "python_version >= '3.7'", "version": "==5.2.4" }, + "lxml": { + "hashes": [ + "sha256:078306d19a33920004addeb5f4630781aaeabb6a8d01398045fcde085091a169", + "sha256:0c1978ff1fd81ed9dcbba4f91cf09faf1f8082c9d72eb122e92294716c605428", + "sha256:1010042bfcac2b2dc6098260a2ed022968dbdfaf285fc65a3acf8e4eb1ffd1bc", + "sha256:1d650812b52d98679ed6c6b3b55cbb8fe5a5460a0aef29aeb08dc0b44577df85", + "sha256:20b8a746a026017acf07da39fdb10aa80ad9877046c9182442bf80c84a1c4696", + "sha256:2403a6d6fb61c285969b71f4a3527873fe93fd0abe0832d858a17fe68c8fa507", + "sha256:24f5c5ae618395ed871b3d8ebfcbb36e3f1091fd847bf54c4de623f9107942f3", + "sha256:28d1af847786f68bec57961f31221125c29d6f52d9187c01cd34dc14e2b29430", + "sha256:31499847fc5f73ee17dbe1b8e24c6dafc4e8d5b48803d17d22988976b0171f03", + "sha256:31ba2cbc64516dcdd6c24418daa7abff989ddf3ba6d3ea6f6ce6f2ed6e754ec9", + "sha256:330bff92c26d4aee79c5bc4d9967858bdbe73fdbdbacb5daf623a03a914fe05b", + "sha256:5045ee1ccd45a89c4daec1160217d363fcd23811e26734688007c26f28c9e9e7", + "sha256:52cbf2ff155b19dc4d4100f7442f6a697938bf4493f8d3b0c51d45568d5666b5", + "sha256:530f278849031b0eb12f46cca0e5db01cfe5177ab13bd6878c6e739319bae654", + "sha256:545bd39c9481f2e3f2727c78c169425efbfb3fbba6e7db4f46a80ebb249819ca", + "sha256:5804e04feb4e61babf3911c2a974a5b86f66ee227cc5006230b00ac6d285b3a9", + "sha256:5a58d0b12f5053e270510bf12f753a76aaf3d74c453c00942ed7d2c804ca845c", + "sha256:5f148b0c6133fb928503cfcdfdba395010f997aa44bcf6474fcdd0c5398d9b63", + "sha256:5f7d7d9afc7b293147e2d506a4596641d60181a35279ef3aa5778d0d9d9123fe", + "sha256:60d2f60bd5a2a979df28ab309352cdcf8181bda0cca4529769a945f09aba06f9", + "sha256:6259b511b0f2527e6d55ad87acc1c07b3cbffc3d5e050d7e7bcfa151b8202df9", + "sha256:6268e27873a3d191849204d00d03f65c0e343b3bcb518a6eaae05677c95621d1", + "sha256:627e79894770783c129cc5e89b947e52aa26e8e0557c7e205368a809da4b7939", + "sha256:62f93eac69ec0f4be98d1b96f4d6b964855b8255c345c17ff12c20b93f247b68", + "sha256:6d6483b1229470e1d8835e52e0ff3c6973b9b97b24cd1c116dca90b57a2cc613", + "sha256:6f7b82934c08e28a2d537d870293236b1000d94d0b4583825ab9649aef7ddf63", + "sha256:6fe4ef4402df0250b75ba876c3795510d782def5c1e63890bde02d622570d39e", + "sha256:719544565c2937c21a6f76d520e6e52b726d132815adb3447ccffbe9f44203c4", + "sha256:730766072fd5dcb219dd2b95c4c49752a54f00157f322bc6d71f7d2a31fecd79", + "sha256:74eb65ec61e3c7c019d7169387d1b6ffcfea1b9ec5894d116a9a903636e4a0b1", + "sha256:7993232bd4044392c47779a3c7e8889fea6883be46281d45a81451acfd704d7e", + "sha256:80bbaddf2baab7e6de4bc47405e34948e694a9efe0861c61cdc23aa774fcb141", + "sha256:86545e351e879d0b72b620db6a3b96346921fa87b3d366d6c074e5a9a0b8dadb", + "sha256:891dc8f522d7059ff0024cd3ae79fd224752676447f9c678f2a5c14b84d9a939", + "sha256:8a31f24e2a0b6317f33aafbb2f0895c0bce772980ae60c2c640d82caac49628a", + "sha256:8b99ec73073b37f9ebe8caf399001848fced9c08064effdbfc4da2b5a8d07b93", + "sha256:986b7a96228c9b4942ec420eff37556c5777bfba6758edcb95421e4a614b57f9", + "sha256:a1547ff4b8a833511eeaceacbcd17b043214fcdb385148f9c1bc5556ca9623e2", + "sha256:a2bfc7e2a0601b475477c954bf167dee6d0f55cb167e3f3e7cefad906e7759f6", + "sha256:a3c5f1a719aa11866ffc530d54ad965063a8cbbecae6515acbd5f0fae8f48eaa", + "sha256:a9f1c3489736ff8e1c7652e9dc39f80cff820f23624f23d9eab6e122ac99b150", + "sha256:aa0cf4922da7a3c905d000b35065df6184c0dc1d866dd3b86fd961905bbad2ea", + "sha256:ad4332a532e2d5acb231a2e5d33f943750091ee435daffca3fec0a53224e7e33", + "sha256:b2582b238e1658c4061ebe1b4df53c435190d22457642377fd0cb30685cdfb76", + "sha256:b6fc2e2fb6f532cf48b5fed57567ef286addcef38c28874458a41b7837a57807", + "sha256:b92d40121dcbd74831b690a75533da703750f7041b4bf951befc657c37e5695a", + "sha256:bbab6faf6568484707acc052f4dfc3802bdb0cafe079383fbaa23f1cdae9ecd4", + "sha256:c0b88ed1ae66777a798dc54f627e32d3b81c8009967c63993c450ee4cbcbec15", + "sha256:ce13d6291a5f47c1c8dbd375baa78551053bc6b5e5c0e9bb8e39c0a8359fd52f", + "sha256:db3535733f59e5605a88a706824dfcb9bd06725e709ecb017e165fc1d6e7d429", + "sha256:dd10383f1d6b7edf247d0960a3db274c07e96cf3a3fc7c41c8448f93eac3fb1c", + "sha256:e01f9531ba5420838c801c21c1b0f45dbc9607cb22ea2cf132844453bec863a5", + "sha256:e11527dc23d5ef44d76fef11213215c34f36af1608074561fcc561d983aeb870", + "sha256:e1ab2fac607842ac36864e358c42feb0960ae62c34aa4caaf12ada0a1fb5d99b", + "sha256:e1fd7d2fe11f1cb63d3336d147c852f6d07de0d0020d704c6031b46a30b02ca8", + "sha256:e9f84ed9f4d50b74fbc77298ee5c870f67cb7e91dcdc1a6915cb1ff6a317476c", + "sha256:ec4b4e75fc68da9dc0ed73dcdb431c25c57775383fec325d23a770a64e7ebc87", + "sha256:f10ce66fcdeb3543df51d423ede7e238be98412232fca5daec3e54bcd16b8da0", + "sha256:f63f62fc60e6228a4ca9abae28228f35e1bd3ce675013d1dfb828688d50c6e23", + "sha256:fa56bb08b3dd8eac3a8c5b7d075c94e74f755fd9d8a04543ae8d37b1612dd170", + "sha256:fa9b7c450be85bfc6cd39f6df8c5b8cbd76b5d6fc1f69efec80203f9894b885f" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", + "version": "==4.8.0" + }, "measurement": { "hashes": [ "sha256:352b20f7f0e553236af7c5ed48d091a51cf26061c1a063f46b31706ff7c0d57a" @@ -368,52 +443,55 @@ }, "pillow": { "hashes": [ - "sha256:011233e0c42a4a7836498e98c1acf5e744c96a67dd5032a6f666cc1fb97eab97", - "sha256:0f29d831e2151e0b7b39981756d201f7108d3d215896212ffe2e992d06bfe049", - "sha256:12875d118f21cf35604176872447cdb57b07126750a33748bac15e77f90f1f9c", - "sha256:14d4b1341ac07ae07eb2cc682f459bec932a380c3b122f5540432d8977e64eae", - "sha256:1c3c33ac69cf059bbb9d1a71eeaba76781b450bc307e2291f8a4764d779a6b28", - "sha256:1d19397351f73a88904ad1aee421e800fe4bbcd1aeee6435fb62d0a05ccd1030", - "sha256:253e8a302a96df6927310a9d44e6103055e8fb96a6822f8b7f514bb7ef77de56", - "sha256:2632d0f846b7c7600edf53c48f8f9f1e13e62f66a6dbc15191029d950bfed976", - "sha256:335ace1a22325395c4ea88e00ba3dc89ca029bd66bd5a3c382d53e44f0ccd77e", - "sha256:413ce0bbf9fc6278b2d63309dfeefe452835e1c78398efb431bab0672fe9274e", - "sha256:5100b45a4638e3c00e4d2320d3193bdabb2d75e79793af7c3eb139e4f569f16f", - "sha256:514ceac913076feefbeaf89771fd6febde78b0c4c1b23aaeab082c41c694e81b", - "sha256:528a2a692c65dd5cafc130de286030af251d2ee0483a5bf50c9348aefe834e8a", - "sha256:6295f6763749b89c994fcb6d8a7f7ce03c3992e695f89f00b741b4580b199b7e", - "sha256:6c8bc8238a7dfdaf7a75f5ec5a663f4173f8c367e5a39f87e720495e1eed75fa", - "sha256:718856856ba31f14f13ba885ff13874be7fefc53984d2832458f12c38205f7f7", - "sha256:7f7609a718b177bf171ac93cea9fd2ddc0e03e84d8fa4e887bdfc39671d46b00", - "sha256:80ca33961ced9c63358056bd08403ff866512038883e74f3a4bf88ad3eb66838", - "sha256:80fe64a6deb6fcfdf7b8386f2cf216d329be6f2781f7d90304351811fb591360", - "sha256:81c4b81611e3a3cb30e59b0cf05b888c675f97e3adb2c8672c3154047980726b", - "sha256:855c583f268edde09474b081e3ddcd5cf3b20c12f26e0d434e1386cc5d318e7a", - "sha256:9bfdb82cdfeccec50aad441afc332faf8606dfa5e8efd18a6692b5d6e79f00fd", - "sha256:a5d24e1d674dd9d72c66ad3ea9131322819ff86250b30dc5821cbafcfa0b96b4", - "sha256:a9f44cd7e162ac6191491d7249cceb02b8116b0f7e847ee33f739d7cb1ea1f70", - "sha256:b5b3f092fe345c03bca1e0b687dfbb39364b21ebb8ba90e3fa707374b7915204", - "sha256:b9618823bd237c0d2575283f2939655f54d51b4527ec3972907a927acbcc5bfc", - "sha256:cef9c85ccbe9bee00909758936ea841ef12035296c748aaceee535969e27d31b", - "sha256:d21237d0cd37acded35154e29aec853e945950321dd2ffd1a7d86fe686814669", - "sha256:d3c5c79ab7dfce6d88f1ba639b77e77a17ea33a01b07b99840d6ed08031cb2a7", - "sha256:d9d7942b624b04b895cb95af03a23407f17646815495ce4547f0e60e0b06f58e", - "sha256:db6d9fac65bd08cea7f3540b899977c6dee9edad959fa4eaf305940d9cbd861c", - "sha256:ede5af4a2702444a832a800b8eb7f0a7a1c0eed55b644642e049c98d589e5092", - "sha256:effb7749713d5317478bb3acb3f81d9d7c7f86726d41c1facca068a04cf5bb4c", - "sha256:f154d173286a5d1863637a7dcd8c3437bb557520b01bddb0be0258dcb72696b5", - "sha256:f25ed6e28ddf50de7e7ea99d7a976d6a9c415f03adcaac9c41ff6ff41b6d86ac" + "sha256:01ce45deec9df310cbbee11104bae1a2a43308dd9c317f99235b6d3080ddd66e", + "sha256:0c51cb9edac8a5abd069fd0758ac0a8bfe52c261ee0e330f363548aca6893595", + "sha256:17869489de2fce6c36690a0c721bd3db176194af5f39249c1ac56d0bb0fcc512", + "sha256:21dee8466b42912335151d24c1665fcf44dc2ee47e021d233a40c3ca5adae59c", + "sha256:25023a6209a4d7c42154073144608c9a71d3512b648a2f5d4465182cb93d3477", + "sha256:255c9d69754a4c90b0ee484967fc8818c7ff8311c6dddcc43a4340e10cd1636a", + "sha256:35be4a9f65441d9982240e6966c1eaa1c654c4e5e931eaf580130409e31804d4", + "sha256:3f42364485bfdab19c1373b5cd62f7c5ab7cc052e19644862ec8f15bb8af289e", + "sha256:3fddcdb619ba04491e8f771636583a7cc5a5051cd193ff1aa1ee8616d2a692c5", + "sha256:463acf531f5d0925ca55904fa668bb3461c3ef6bc779e1d6d8a488092bdee378", + "sha256:4fe29a070de394e449fd88ebe1624d1e2d7ddeed4c12e0b31624561b58948d9a", + "sha256:55dd1cf09a1fd7c7b78425967aacae9b0d70125f7d3ab973fadc7b5abc3de652", + "sha256:5a3ecc026ea0e14d0ad7cd990ea7f48bfcb3eb4271034657dc9d06933c6629a7", + "sha256:5cfca31ab4c13552a0f354c87fbd7f162a4fafd25e6b521bba93a57fe6a3700a", + "sha256:66822d01e82506a19407d1afc104c3fcea3b81d5eb11485e593ad6b8492f995a", + "sha256:69e5ddc609230d4408277af135c5b5c8fe7a54b2bdb8ad7c5100b86b3aab04c6", + "sha256:6b6d4050b208c8ff886fd3db6690bf04f9a48749d78b41b7a5bf24c236ab0165", + "sha256:7a053bd4d65a3294b153bdd7724dce864a1d548416a5ef61f6d03bf149205160", + "sha256:82283af99c1c3a5ba1da44c67296d5aad19f11c535b551a5ae55328a317ce331", + "sha256:8782189c796eff29dbb37dd87afa4ad4d40fc90b2742704f94812851b725964b", + "sha256:8d79c6f468215d1a8415aa53d9868a6b40c4682165b8cb62a221b1baa47db458", + "sha256:97bda660702a856c2c9e12ec26fc6d187631ddfd896ff685814ab21ef0597033", + "sha256:a325ac71914c5c043fa50441b36606e64a10cd262de12f7a179620f579752ff8", + "sha256:a336a4f74baf67e26f3acc4d61c913e378e931817cd1e2ef4dfb79d3e051b481", + "sha256:a598d8830f6ef5501002ae85c7dbfcd9c27cc4efc02a1989369303ba85573e58", + "sha256:a5eaf3b42df2bcda61c53a742ee2c6e63f777d0e085bbc6b2ab7ed57deb13db7", + "sha256:aea7ce61328e15943d7b9eaca87e81f7c62ff90f669116f857262e9da4057ba3", + "sha256:af79d3fde1fc2e33561166d62e3b63f0cc3e47b5a3a2e5fea40d4917754734ea", + "sha256:c24f718f9dd73bb2b31a6201e6db5ea4a61fdd1d1c200f43ee585fc6dcd21b34", + "sha256:c5b0ff59785d93b3437c3703e3c64c178aabada51dea2a7f2c5eccf1bcf565a3", + "sha256:c7110ec1701b0bf8df569a7592a196c9d07c764a0a74f65471ea56816f10e2c8", + "sha256:c870193cce4b76713a2b29be5d8327c8ccbe0d4a49bc22968aa1e680930f5581", + "sha256:c9efef876c21788366ea1f50ecb39d5d6f65febe25ad1d4c0b8dff98843ac244", + "sha256:de344bcf6e2463bb25179d74d6e7989e375f906bcec8cb86edb8b12acbc7dfef", + "sha256:eb1b89b11256b5b6cad5e7593f9061ac4624f7651f7a8eb4dfa37caa1dfaa4d0", + "sha256:ed742214068efa95e9844c2d9129e209ed63f61baa4d54dbf4cf8b5e2d30ccf2", + "sha256:f401ed2bbb155e1ade150ccc63db1a4f6c1909d3d378f7d1235a44e90d75fb97", + "sha256:fb89397013cf302f282f0fc998bb7abf11d49dcff72c8ecb320f76ea6e2c5717" ], "index": "pypi", - "version": "==9.0.1" + "version": "==9.1.0" }, "prompt-toolkit": { "hashes": [ - "sha256:30129d870dcb0b3b6a53efdc9d0a83ea96162ffd28ffe077e94215b233dc670c", - "sha256:9f1cd16b1e86c2968f2519d7fb31dd9d669916f515612c269d14e9ed52b51650" + "sha256:62291dad495e665fca0bda814e342c69952086afb0f4094d0893d357e5c78752", + "sha256:bd640f60e8cecd74f0dc249713d433ace2ddc62b65ee07f96d358e0b152b6ea7" ], "markers": "python_full_version >= '3.6.2'", - "version": "==3.0.28" + "version": "==3.0.29" }, "psycopg2": { "hashes": [ @@ -568,11 +646,11 @@ }, "redis": { "hashes": [ - "sha256:04629f8e42be942c4f7d1812f2094568f04c612865ad19ad3ace3005da70631a", - "sha256:1d9a0cdf89fdd93f84261733e24f55a7bbd413a9b219fdaf56e3e728ca9a2306" + "sha256:0107dc8e98a4f1d1d4aa00100e044287f77121a1e6d2085545c4b7fa94a7a27f", + "sha256:4e95f4ec5f49e636efcf20061a5a9110c20852f607cfca6865c07aaa8a739ee2" ], "index": "pypi", - "version": "==4.1.4" + "version": "==4.2.2" }, "requests": { "hashes": [ @@ -615,14 +693,6 @@ ], "version": "==1.2.0" }, - "setuptools": { - "hashes": [ - "sha256:22c7348c6d2976a52632c67f7ab0cdf40147db7789f9aed18734643fe9cf3373", - "sha256:4ce92f1e1f8f01233ee9952c04f6b81d1e02939d6e1b488428154974a4d0783e" - ], - "markers": "python_version >= '3.6'", - "version": "==59.6.0" - }, "six": { "hashes": [ "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", @@ -655,6 +725,13 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_full_version < '4.0.0'", "version": "==1.26.9" }, + "usps-api": { + "hashes": [ + "sha256:20c2f19e02dde3eac01b794d6a4c1bcad03ab681d67a8579d090dbda5e5247a3" + ], + "index": "pypi", + "version": "==0.5" + }, "vine": { "hashes": [ "sha256:4c9dceab6f76ed92105027c49c823800dd33cacce13bdedc5b914e3514b7fb30", @@ -739,6 +816,13 @@ ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==1.14.0" + }, + "xmltodict": { + "hashes": [ + "sha256:50d8c638ed7ecb88d90561beedbf720c9b4e851a9fa6c47ebd64e99d166d8a21", + "sha256:8bbcb45cc982f48b2ca8fe7e7827c5d792f217ecf1792626f808bf41c3b86051" + ], + "version": "==0.12.0" } }, "develop": { @@ -951,7 +1035,7 @@ "sha256:670a52d3115d0e879e1ac838a4eb999af32f858163e3a704fe4839de2a676070", "sha256:fb2d48e4eab0dfb786a472cd514aaadc71e3445b203bc300bad93daa75d77c1a" ], - "markers": "python_version >= '3.7'", + "markers": "python_full_version >= '3.7.0'", "version": "==0.20.0" }, "trio-websocket": { @@ -975,7 +1059,7 @@ "sha256:2218cb57952d90b9fca325c0dcfb08c3bda93e8fd8070b0a17f048e2e47a521b", "sha256:a2e56bfd5c7cd83c1369d83b5feccd6d37798b74872866e62616e0ecf111bda8" ], - "markers": "python_version >= '3.7'", + "markers": "python_full_version >= '3.7.0'", "version": "==1.1.0" } } diff --git a/src/dashboard/templates/dashboard/shipmeth_create_form.html b/src/dashboard/templates/dashboard/shipmeth_create_form.html index 628d75a..88cd9bc 100644 --- a/src/dashboard/templates/dashboard/shipmeth_create_form.html +++ b/src/dashboard/templates/dashboard/shipmeth_create_form.html @@ -1,8 +1,8 @@ {% extends "dashboard.html" %} {% block content %} -
-

Create shipmeth

+
+

Create Shipping Method

{% csrf_token %} diff --git a/src/static/styles/main.css b/src/static/styles/main.css index b9990eb..30668be 100644 --- a/src/static/styles/main.css +++ b/src/static/styles/main.css @@ -70,6 +70,19 @@ small, .text-small { font-size: 0.833rem; } +blockquote { + margin: 0 0 1rem; + padding: 0; +} + +blockquote q { + /*font-weight: bold;*/ + font-size: 1.5rem; +} +blockquote cite { + display: block; +} + .text-center { text-align: center; } @@ -440,6 +453,40 @@ article > header { margin-bottom: 1rem; } +.article__header--with-action { + display: flex; + justify-content: space-between; + align-items: center; +} + +article + article { + margin-top: 8rem; +} + +/* Product reviews + ========================================================================== */ +.review__list { + display: grid; + grid-template-columns: repeat(2, 1fr); + gap: 4rem; +} + +.review__list-short { + margin: inherit auto; + max-width: 64ch; + text-align: center; +} + +.review__item { + text-align: center; +} + +@media screen and (max-width: 600px) { + .review__list { + grid-template-columns: 1fr; + } +} + /* Products ========================================================================== */ .product__list { diff --git a/src/storefront/templates/storefront/customer_detail.html b/src/storefront/templates/storefront/customer_detail.html index c3a3acd..07a25e2 100644 --- a/src/storefront/templates/storefront/customer_detail.html +++ b/src/storefront/templates/storefront/customer_detail.html @@ -3,19 +3,19 @@ {% block content %}
-
+

{{customer.get_full_name}}

Edit profile

Info

-
+

Email address
{{customer.email}}
Manage -

-
- Default shipping address
+

+

+ Default shipping address {% with shipping_address=customer.default_shipping_address %}

{{shipping_address.first_name}} @@ -27,7 +27,7 @@ {{shipping_address.city}}, {{shipping_address.state}}, {{shipping_address.postal_code}}
{% endwith %} -
+

All addresses

{% for address in customer.addresses.all %} @@ -48,31 +48,31 @@ {% endfor %}
- {% with order_list=customer.orders.all %} +{% with order_list=customer.orders.all %} +

Your orders

-
- - - - - - - - - - {% for order in order_list %} - - - - - - - {% empty %} - No orders - {% endfor %} - -
Order #DateTotal
#{{order.pk}}{{order.created_at|date:"M j, Y"}}${{order.total_net_amount}}See details →
-
- {% endwith %} + + + + + + + + + + {% for order in order_list %} + + + + + + + {% empty %} + No orders + {% endfor %} + +
Order #DateTotal
#{{order.pk}}{{order.created_at|date:"M j, Y"}}${{order.total_net_amount}}See details →
+
+{% endwith %}
{% endblock content %} diff --git a/src/storefront/templates/storefront/product_list.html b/src/storefront/templates/storefront/product_list.html index f008430..87fc395 100644 --- a/src/storefront/templates/storefront/product_list.html +++ b/src/storefront/templates/storefront/product_list.html @@ -20,5 +20,36 @@ {% endfor %}
+
+
+

What people are saying

+
+
+
+ Really good coffee. That's all there is to say. Supposedly the pour over coffee is the best way to go. It is definitely nothing like a Starbucks, and in this case, that's a very good thing! + -Mark Nickel +
+ +
+ They have a passion for their coffee and chai. What makes them interesting is the intensity of flavor and not the extreme sweetness that other coffee shops focus on. The mocha had the velvety bitterness of true cocoa and the chai was more reminiscent of walking through an Indian spice store. These are drinks that should be sipped while sitting quietly at one of their picnic tables looking out at the water. + -Natasha Hughes +
+ +
+ Morning started with a Caffè Arancia and a scone. Couldn't have gotten anything better. Superb flavor for the coffee, a delight to drink. + -Mr Ty +
+ +
+ Warm and welcoming place with the best Americano I’ve ever had. + -Mathew Metcalfe +
+
+
+

+ Read more → +

+
+
{% endblock %} diff --git a/src/storefront/templates/storefront/reviews.html b/src/storefront/templates/storefront/reviews.html new file mode 100644 index 0000000..d794e5a --- /dev/null +++ b/src/storefront/templates/storefront/reviews.html @@ -0,0 +1,771 @@ +{% extends 'base.html' %} + +{% block content %} +
+
+

Reviews

+
+
+
+ Really good coffee. That's all there is to say. Supposedly the pour over coffee is the best way to go. It is definitely nothing like a Starbucks, and in this case, that's a very good thing! + -Mark Nickel +
+ +
+ They have a passion for their coffee and chai. What makes them interesting is the intensity of flavor and not the extreme sweetness that other coffee shops focus on. The mocha had the velvety bitterness of true cocoa and the chai was more reminiscent of walking through an Indian spice store. These are drinks that should be sipped while sitting quietly at one of their picnic tables looking out at the water. + -Natasha Hughes +
+ +
+ Morning started with a Caffè Arancia and a scone. Couldn't have gotten anything better. Superb flavor for the coffee, a delight to drink. + -Mr Ty +
+ +
+ Warm and welcoming place with the best Americano I’ve ever had. + -Mathew Metcalfe +
+ +
+ Go to this coffee shop if you want great coffee and a pleasant atmosphere. The caramel latte I got handed had a great consistency, perfect amount of foam, and excellent taste. The staff know how to make good coffee. + -Nate Sullivan +
+ +
+ The absolute best coffee house in town! Don't worry about the line, the wait is well worth it. + -Brian +
+ +
+ This is my first stop every time I go through town. The coffee is amazing! The food is amazing! The people are amazing! Seriously wish we had a sister shop over in Seattle. + -Steve Cragar +
+ +
+ We've tried four different coffee shops in Port Townsend and this one is simply the best of those we've visited. Sometimes, there's a bit of a line but that's an indication of a popular spot and it's well worth the wait. Definitely would recommend you try them if you've never been. + -William Jones +
+ +
+ If I did nothing else in Port Townsend except visit this coffee shop, it would have been worth the trip. By far one of the best lattes I've ever had, even with non-dairy milk + -Keera Lindenberg +
+ +
+ The espresso was so good, we kept coming back and bought a bag of beans. + -Brett Melton +
+ +
+ This coffee shop is BY FAR the best coffee shop I have ever been to - and I have been to coffee shops around the world. Inexpensive, organic and absolutely delicious espresso drinks + -karolina anderson +
+ +
+ I don’t get out to Port Townsend often but every time I do I make a point to stop at Better Living Through Coffee. Their Caffè Arancia is one of the best coffee beverages I’ve ever had. + -Brenton Woodrow +
+ +
+ This was the best cup of coffee I've ever had. I go for Americano every time. It is truly about the coffee. + -Jeri Baird +
+ +
+ Stopped by on my way to oyster run last year and it was the best coffee experience ive ever had. It was an amazing cup of drip coffee + -james williams +
+ +
+ One of those hidden local gems that serve the best coffee + -michael peterson +
+ +
+ This place has the best iced coffee I have ever had. + -Troy Goracke +
+ +
+ One of the best coffee shops in the country! + -Brian Rohr +
+ +
+ The x4 shot iced coffee will forever leave me chasing the dragon. It was richly coffee flavored with out being bitter ... unmatched the world over. I'll be back every time I visit Washington! + -Conner Morlang +
+ +
+ When visiting Port Townsend, this is THE place to get coffee. The coffee is outstanding and offered in a variety of ways. + -kathleen b +
+ +
+ Amazing coffee at prices lower than their competitors. + -Monique Ermine +
+ +
+ Just the best dang pour over coffee + -Jonquil Elise Dreadful +
+ +
+ The best coffee very tasty. + -Audy Vasquez-Ramirez +
+ +
+ Outstanding Coffee service and ambiance. + -Mimi Magoo +
+ +
+ A... MAZ...ING! Dantes coffee pour over is stellar. + -Jeremy Bryant +
+ +
+ Excellent coffee and service. I drove 90 miles for Sofia's Sumatra. + -Ian Roberts +
+ +
+ Best coffee in Port Townsend. + -Anna Stenwick +
+ +
+ Great view and outside seating area. Plus the coffee was amazing and top notch service. + -Laura McKinney +
+ +
+ Delicious coffee. Fresh, local, organic ingredients. So nice to sit and enjoy the waterfront view. + -R_ V_B +
+ +
+ I had one of the best mugs of pour over coffee I've ever tasted. + -Ken Hoekema +
+ +
+ A must stop in Port Townsend!! The coffee drink was amazing + -Patty Glenn +
+ +
+ Really great cup of espresso! + -Vicky G +
+ +
+ They really make good coffee. Quality beans for sure. + -Jason Everett +
+ +
+ Pour over specialty here. 10/10 on coffee + -Olive Cattau +
+ +
+ Seriously good coffee, comfortable welcoming atmosphere + -Eric Mager +
+ +
+ Excellent coffee delivered by friendly people in a cool environment + -Mr T +
+ +
+ This has ended up the place we end up going to every trip to Port Townsend. Awesome coffees and drinks, + -Sean McNulty +
+ +
+ Beautiful view, amazing coffee and the friendliest staff! Highly recommended + -SCH Travel +
+ +
+ Very hip, warm atmosphere, great views and wonderful coffee. + -Toke Beard +
+ +
+ Funky, friendly atmosphere and a great cup of coffee, freshly dripped right into your cup. + -Mike Cutcliff +
+ +
+ Delicious coffee. Love this place! + -Jenny Mitchell +
+ +
+ Best orange espresso (Arancia)! Also, a calm atmosphere and competent staff. + -Deanne McCausland +
+ +
+ Great service, awesome coffee.. low key always a favorite.. + -E Quigley +
+ +
+ Amazing place..the coffee drinks are so delicious. Great staff. + -Angela Dawn +
+ +
+ They are very friendly and make the best cafe arancia ever. Yumm + -Vicki Moler +
+ +
+ An absolutely delightful spot to visit. Nice views and a casual unpretentious vibe, + -Kevin Chung +
+ +
+ Great place! Great coffee, staff and amazing location. + -Juanita Sheppard +
+ +
+ Great coffee and amazing view. + -Graham Magnuson +
+ +
+ This is a unique, albeit a bit quirky place. Creative coffee drinks. + -Artak Kalantarian +
+ +
+ This place is my daily grind awesome staff awesome owner most incredible of you in a coffee shop I've ever had + -mugen andeson +
+ +
+ Great coffee and service. + -Jeannette Heffley +
+ +
+ Great atmosphere! Nice people! AWESOME coffee and food! + -N R +
+ +
+ Best coffee/espresso on the peninsula. + -Rachel Rutledge +
+ +
+ Awesome view and atmosphere. Good coffee as well. + -Andrew Law +
+ +
+ Best coffee by a mile, good service. Ambiance : Gemuetlich. + -Hans Knigge +
+ +
+ I was just there with my girlfriend on a rainy day. We got the best hot chocolate we have ever had. + -Will Hale +
+ +
+ Grab you Cappuccino, go outside and enjoy the waves on the beach. Life is good. + -Bill Crane +
+ +
+ Beautiful setting great coffee fabulous service I will be back + -Karen Karadimov +
+ +
+ Amazing coffee and food, friendly service and chill atmosphere + -Muldair Moore +
+ +
+ Nice staff and friendly atmosphere and good coffee too. + -Chainarong Patana-anake +
+ +
+ Amazing views, great coffee, and a large local following + -Bradford Billings +
+ +
+ Great coffee. Good service. Relaxing environment. + -Bob Phillips +
+ +
+ Great coffee, food and views + -Chris Langston +
+ +
+ Best coffee ever! Waterfront, great location. + -Susan Willis +
+ +
+ Such care, great food, killin' views & the coffee zings. Good. + -Scott Doran +
+ +
+ Great service!! Great staff!! Very good coffee!! + -casey reuck +
+ +
+ The coffee goes well with the view. Makes sense why it's so popular. + -Dabin Park +
+ +
+ Great coffee. Excellent food. Beautiful views + -James Reynolds +
+ +
+ Excellent espresso super service + -Sharon Jack +
+ +
+ Good coffee and good prices. Starbucks ain't got nothing on BLTC. + -Garrett Massey +
+ +
+ Oh the coffee is simply the best. + -Stephen Smith +
+ +
+ Great coffee! + -Jessica Dugal +
+ +
+ They make the best salted Caramel lattes in the world. + -Margaret Barbo +
+ +
+ What not to love...the view, the organic way of Caffeine, the friendly fun atmosphere… + -Dr. Joseph Adam +
+ +
+ Great coffee. Loved it + -Rapunzel +
+ +
+ Such good coffee + -Peggy Baker +
+ +
+ Great local coffee shop, awesome coffee + -Parley Wells +
+ +
+ Best Sumatra dark drip to go. Great people. + -Scott Tennant +
+ +
+ Great food, great coffee, hardworking staff + -Stevie Schmidt +
+ +
+ Best coffee in Port Townsend! + -Robert Maass +
+ +
+ Friendly place. Awesome people and great coffee! + -Brett Merkley +
+ +
+ The Coffee Here Is Really Great. It's great. The coffee + -John Buday +
+ +
+ Superb quad-shot espresso drinks and pastries straight from the angels! + -Bradley Smull +
+ +
+ A comfortable and relaxing place with delicious coffee. + -Morgan Humphreys +
+ +
+ Better Living With Coffee has the best salted caramel latte + -Gilbert Barbo +
+ +
+ Awesome coffee and amazing ambiance ♥️ + -Hamsa Abdullah +
+ +
+ Get the coffee Arancia. It's the best thing to happen to the planet since the polio vaccine. + -Shane Squire +
+ +
+ Delicious drip coffee for a reasonable price! + -Ian McLaughlan +
+ +
+ I love BLTC. Great coffee and great people. + -Sea Otter +
+ +
+ Beautiful view, awesome coffee, ethical standards + -Charles Boyles +
+ +
+ Great coffee, food, people and view! + -Gabe Herbert +
+ +
+ Great coffee and great food + -Scott Clarkson +
+ +
+ Great coffee, and atmosphere! + -Kristina Koranek +
+ +
+ Had a fantastic wet cappuccino + -Scott Urstad +
+ +
+ Delicious coffee in a friendly atmosphere. + -Barbara Beers +
+ +
+ The best, simply the best coffee in town. + -C Miller +
+ +
+ Best coffee in PT + -Peggy Baker +
+ +
+ Best latte I have ever had. + -Juan Haley +
+ +
+ Always my favorite coffee shop! + -leslie shawn +
+ +
+ Great location, great views, great coffee + -yr deervvitch +
+ +
+ Great coffee! + -Reed McGinnis +
+ +
+ Nice place for coffee ☕🍪🤯 + -Blowing Bubbles +
+ +
+ Amazing quality of product and personnel. + -Tim Hartzell +
+ +
+ Amazing coffee great staff + -Thomas Carso +
+ +
+ Best coffee on the west coast. + -Mark Burchfield +
+ +
+ Awesome coffee! + -Karen Fry +
+ +
+ Nice coffee + -リーBryan +
+ +
+ Loved it. Good coffee. + -Hans Schweizer +
+ +
+ My favorite reason to visit Port Townsend! + -Ilana Moss +
+ +
+ Best Espresso on the Peninsula!! + -Audra Downs +
+ +
+ The best coffee in Port Townsend + -Denice Nolan +
+ +
+ Great coffee! + -Joe Bolton +
+ +
+ Fabulous coffee and staff!! + -Candice Cotterill +
+ +
+ Good ..No GREAT COFFEE + -David Ustick +
+ +
+ I love their coffee + -Julie Canterbury +
+ +
+ Slice of heaven on the waterfront. + -John Franich +
+ +
+ A top notch coffee house + -The dog cat reptile And plant lady +
+ +
+ Very cool coffee shop. + -ramsay tanham +
+ +
+ I love love love the Pantomime French! + -Cynthia Koan +
+ +
+ Great coffee + -Eric Black +
+ +
+ Drip coffee done right + -Austin Ivey +
+ +
+ Varied, sustainable, and delicious! + -Daniel Archer +
+ +
+ 5 stars says it all! + -N Croston +
+ +
+ Yummy! + -Pearl Newt +
+ +
+ The coffee is delicious. + -Destini Jewell +
+ +
+ Delightful coffee and place. + -Ash +
+ +
+ Yummy coffee + -Nichole Van Duren +
+ +
+ Best coffee in town + -Natalie Ainge (Kerrigan Byrne) +
+ +
+ This place has it all! + -Lillian Henegar +
+ +
+ Lovely + -C.S. Hirst ndt +
+ +
+ I just love this place. ❤️ + -Kristina +
+ +
+ Delicious coffee! + -sopalla d +
+ +
+ Excellent coffee + -Tom Hunter +
+ +
+ I love everything about this place. + -James Jacoby +
+ +
+ Amazing + -Nicole Malloy +
+ +
+ Always the best choice + -ANTHONY DIORIO +
+ +
+ Excellent cup of coffee + -Monica Buchholz +
+ +
+ Wow! + -Ken P +
+ +
+ Delicious. Adina Than. Great coffee + -Angela Fusaro +
+ +
+ Yum + -Jeff Royster +
+ +
+ Good coffee + -Richard Paul +
+ +
+ Chetzemoka for the win + -Ian Sanderson +
+ +
+ Good Coffee + -Rob Kline +
+ +
+ the highlight of PT + -Jessica von Volkli +
+ +
+ Smart coffee shop and good coffee! They have good coffee and that’s not easy to find outside of Seattle really. Drip coffee made inventively. Many types to keep people coming back. + -Iwamisea +
+ +
+ Ah, Coffee! And more… Some of the best coffee in Port Townsend spoken from the lips of a long-time coffee/espresso drinker. It's fresh and strong + -James B +
+ +
+ Best coffee! This is a place for every coffee lover and coffee aficionado. + -FABJourney +
+ +
+ As somewhat of a coffee snob, finding a good cup of joe, or a great latte, is what can turn my entire day around. The latte was OUTSTANDING. + -BEST COFFEE IN PORT TOWNSEND +
+ +
+ The place to go. My only complaint is that it is too popular… + -Ryan C +
+ + +
+ Pure Port Townsend. Perfect and delicious locally roasted coffees + -janetzim +
+ +
+ Great Coffee. Love this coffee shop, very interesting spot and has a great view. The coffee is amazing! Had the Arancia (think this is how it is spelled) quite a few times and continue to crave it to this day. + -Cas M +
+ +
+ Great coffee and kind staff. We went to this place 4 days in a row recently while on vacation. Staff greeted us kindly and made us some of the best coffee we'd had in a long time. + -922aaronm +
+ +
+ Wonderful! GREAT coffee! If you are a coffee lover you must go here. + -Maggie L +
+
+
+{% endblock %} diff --git a/src/storefront/urls.py b/src/storefront/urls.py index 4c505f8..e31f60e 100644 --- a/src/storefront/urls.py +++ b/src/storefront/urls.py @@ -3,6 +3,7 @@ from . import views urlpatterns = [ path('about/', views.AboutView.as_view(), name='about'), + path('reviews/', views.ReviewListView.as_view(), name='reviews'), path('contact/', views.ContactFormView.as_view(), name='contact'), path('', views.ProductListView.as_view(), name='product-list'), diff --git a/src/storefront/views.py b/src/storefront/views.py index 32a9aae..561ea3c 100644 --- a/src/storefront/views.py +++ b/src/storefront/views.py @@ -207,6 +207,7 @@ class OrderCreateView(CreateView): return context def form_valid(self, form): + # TODO: make order status "Draft" and then in the PP capture set status appropriately cart = Cart(self.request) shipping_address = self.request.session.get('shipping_address') form.instance.customer, form.instance.shipping_address = get_or_create_customer(self.request, form, shipping_address) @@ -293,6 +294,9 @@ class AddressUpdateView(LoginRequiredMixin, UpdateView): class AboutView(TemplateView): template_name = 'storefront/about.html' +class ReviewListView(TemplateView): + template_name = 'storefront/reviews.html' + class ContactFormView(FormView, SuccessMessageMixin): template_name = 'storefront/contact_form.html' form_class = ContactForm