175 Commits

Author SHA1 Message Date
Nathan Chapman
356c759155 Merge branch 'release/1.3.0' 2022-05-12 18:44:11 -06:00
Nathan Chapman
09f164dc0c Merge tag 'v1.3.0' into develop
1.3.0 v1.3.0
2022-05-12 18:44:11 -06:00
Nathan Chapman
06d809f7f4 Add functionality to cancel an order from dashboard 2022-05-12 18:43:55 -06:00
Nathan Chapman
8e223c5426 Merge branch 'hotfix/1.2.2' 2022-05-12 17:39:01 -06:00
Nathan Chapman
d93f266861 Merge tag 'v1.2.2' into develop
1.2.2 v1.2.2
2022-05-12 17:39:01 -06:00
Nathan Chapman
cc40d3e4db Move coupon save to appropriate place 2022-05-12 17:38:51 -06:00
Nathan Chapman
dd97a7cfc4 Merge branch 'hotfix/1.2.1' 2022-05-11 20:39:21 -06:00
Nathan Chapman
53a407c588 Merge tag 'v1.2.1' into develop
1.2.1 v1.2.1
2022-05-11 20:39:21 -06:00
Nathan Chapman
ee186f047e Fix when no coupon error 2022-05-11 20:39:14 -06:00
Nathan Chapman
16c308a67b Merge tag 'v1.2.0' into develop
1.2.0 v1.2.0
2022-05-11 20:10:16 -06:00
Nathan Chapman
56dd5e98b0 Merge branch 'release/1.2.0' 2022-05-11 20:10:15 -06:00
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