164 Commits

Author SHA1 Message Date
Nathan Chapman
37ef9d3928 Merge branch 'feature/user-permissions' into develop 2022-05-11 20:09:52 -06:00
Nathan Chapman
4f43cc6a80 Add coupon check 2022-05-11 20:09:45 -06:00
Nathan Chapman
058d682ddb Error templates 2022-05-11 17:39:33 -06:00
Nathan Chapman
60896a2835 pep8 2022-05-11 17:39:22 -06:00
Nathan Chapman
3f20c97b43 Merge branch 'release/1.1.1' 2022-05-08 14:47:11 -06:00
Nathan Chapman
750afa6033 Merge tag 'v1.1.1' into develop
1.1.1 v1.1.1
2022-05-08 14:47:11 -06:00
Nathan Chapman
2521beea74 Add custom filter and remove individual grinds functionality 2022-05-08 14:46:55 -06:00
Nathan Chapman
b24b65da5c Merge branch 'release/1.1.0' 2022-05-08 12:14:40 -06:00
Nathan Chapman
0f7a36a569 Merge tag 'v1.1.0' into develop
1.1.0 v1.1.0
2022-05-08 12:14:40 -06:00
Nathan Chapman
89b40d639d Add ability for customer to add their own shipping address 2022-05-08 12:14:21 -06:00
Nathan Chapman
2ce2b59118 Merge branch 'feature/addresses' into develop 2022-05-08 10:24:26 -06:00
Nathan Chapman
8587366e9e Add functional tests to test addresses 2022-05-08 10:24:23 -06:00
Nathan Chapman
e68a6080f2 Better Logging 2022-05-08 10:24:00 -06:00
Nathan Chapman
c93709324a Merge branch 'release/1.0.13' 2022-05-05 18:19:36 -06:00
Nathan Chapman
4d22f87657 Merge tag 'v1.0.13' into develop
1.0.13 v1.0.13
2022-05-05 18:19:36 -06:00
Nathan Chapman
98b6f5e9c4 Add tests 2022-05-05 18:17:53 -06:00
Nathan Chapman
46bc3ff0ff Fixes 2022-05-02 19:40:15 -06:00
Nathan Chapman
592161aa67 Merge branch 'release/1.0.13' 2022-05-01 10:47:32 -06:00
Nathan Chapman
e2dbe4cec6 Merge branch 'master' into develop 2022-05-01 10:47:32 -06:00
Nathan Chapman
036f873408 Merge branch 'feature/paypal' into develop 2022-05-01 10:47:11 -06:00
Nathan Chapman
b3c75bdb7d Fix paypal same-site origin opener policy 2022-05-01 10:47:08 -06:00
Nathan Chapman
f2003a711f Update USPS shipping handling 2022-05-01 10:29:59 -06:00
Nathan Chapman
49b6f2effb Merge branch 'release/1.0.12' 2022-04-30 17:55:26 -06:00
Nathan Chapman
b13511e59e Merge tag 'v1.0.12' into develop
1.0.12 v1.0.12
2022-04-30 17:55:26 -06:00
Nathan Chapman
c197bcd617 Add logging datetime 2022-04-30 17:55:10 -06:00
Nathan Chapman
c21c129207 Merge branch 'release/1.0.11' 2022-04-30 17:27:34 -06:00
Nathan Chapman
424f56993c Merge tag 'v1.0.11' into develop
1.0.11 v1.0.11
2022-04-30 17:27:34 -06:00
Nathan Chapman
0c7020b42c Merge branch 'feature/order-migration' into develop 2022-04-30 17:27:16 -06:00
Nathan Chapman
47df760c5f Remove required fields for order 2022-04-30 17:23:44 -06:00
Nathan Chapman
23ab6974fe Remove required fields for order 2022-04-30 17:23:22 -06:00
Nathan Chapman
2e9c558f04 Merge branch 'release/1.0.10' 2022-04-30 15:31:48 -06:00
Nathan Chapman
e506bfda55 Merge tag 'v1.0.10' into develop
1.0.10 v1.0.10
2022-04-30 15:31:48 -06:00
Nathan Chapman
7e5985fdc7 Set proper Paypal environment for production 2022-04-30 15:31:17 -06:00
Nathan Chapman
76862449c5 Merge branch 'release/1.0.9' 2022-04-30 14:29:00 -06:00
Nathan Chapman
03a2a8a417 Merge tag 'v1.0.9' into develop
1.0.9 v1.0.9
2022-04-30 14:29:00 -06:00
Nathan Chapman
a1eb2bab18 Add static root path setting 2022-04-30 14:28:45 -06:00
Nathan Chapman
4ddd8393bf Merge branch 'release/1.0.8' 2022-04-30 14:24:02 -06:00
Nathan Chapman
55eec6d91c Merge tag 'v1.0.8' into develop
1.0.8 v1.0.8
2022-04-30 14:24:02 -06:00
Nathan Chapman
ba3e19d2bf Update Allowed hosts 2022-04-30 14:23:40 -06:00
Nathan Chapman
17a7c98fdc Merge branch 'release/1.0.7' 2022-04-30 11:11:16 -06:00
Nathan Chapman
44c8674ea0 Merge tag 'v1.0.7' into develop
1.0.7 v1.0.7
2022-04-30 11:11:16 -06:00
Nathan Chapman
13d016c888 Add LineItem for each variation 2022-04-30 11:10:40 -06:00
Nathan Chapman
b009b1bc85 Merge branch 'feature/cleanup' into develop 2022-04-30 10:23:50 -06:00
Nathan Chapman
1f96330e67 Fixes and updates 2022-04-30 10:23:02 -06:00
Nathan Chapman
642c7aaf9f Add phone number back to site footer and contact pages 2022-04-30 09:44:53 -06:00
Nathan Chapman
3fb954af93 Add photos to about page 2022-04-30 09:44:38 -06:00
Nathan Chapman
b2c0538172 Add page banners 2022-04-30 09:37:41 -06:00
Nathan Chapman
373de1862b Add titles to main pages 2022-04-30 09:21:13 -06:00
Nathan Chapman
ff1df9827a Merge branch 'release/1.0.7' 2022-04-28 20:16:54 -06:00
Nathan Chapman
902870afd8 Merge branch 'master' into develop 2022-04-28 20:16:54 -06:00