496 Commits

Author SHA1 Message Date
Nathan Chapman
38058a51d3 Merge tag 'v1.3.5' into develop
1.3.5 v1.3.5
2022-05-15 07:44:54 -06:00
Nathan Chapman
6caa61a5f8 Merge branch 'release/1.3.5' 2022-05-15 07:44:53 -06:00
Nathan Chapman
62031b72fd Change grind details location to name 2022-05-15 07:44:11 -06:00
Nathan Chapman
9c4e680f19 Merge branch 'hotfix/allowed-hosts' 2022-05-14 21:35:10 -06:00
Nathan Chapman
af52ac5940 Merge tag 'vallowed-hosts' into develop
1.3.5 vallowed-hosts
2022-05-14 21:35:10 -06:00
Nathan Chapman
b7f317a379 Add extra urls to allowed hosts 2022-05-14 21:34:54 -06:00
Nathan Chapman
3aec36429e Merge tag 'v1.3.4' into develop
1.3.4 v1.3.4
2022-05-14 07:51:38 -06:00
Nathan Chapman
c7c3aa3411 Merge branch 'release/1.3.4' 2022-05-14 07:51:37 -06:00
Nathan Chapman
35ef1f606a Fix dashboard totals 2022-05-14 07:51:10 -06:00
Nathan Chapman
73c1c69736 Merge branch 'hotfix/payment-capture' 2022-05-14 07:38:56 -06:00
Nathan Chapman
6aab1b3462 Merge tag 'vpayment-capture' into develop
1.3.4 vpayment-capture
2022-05-14 07:38:56 -06:00
Nathan Chapman
63eae6897c Fix coupon instance 2022-05-14 07:35:31 -06:00
Nathan Chapman
77e302f853 Merge branch 'hotfix/1.3.3' 2022-05-14 07:33:07 -06:00
Nathan Chapman
59fa609918 Merge tag 'v1.3.3' into develop
1.3.3 v1.3.3
2022-05-14 07:33:07 -06:00
Nathan Chapman
adb3b73d5f Remove self 2022-05-14 07:32:59 -06:00
Nathan Chapman
cf772a00b3 Merge branch 'release/1.3.2' 2022-05-12 21:48:36 -06:00
Nathan Chapman
c1d5801d77 Merge tag 'v1.3.2' into develop
1.3.2 v1.3.2
2022-05-12 21:48:36 -06:00
Nathan Chapman
63a15b8935 Add try/catch when fetching user 2022-05-12 21:48:18 -06:00
Nathan Chapman
0d7c2446e2 Merge branch 'release/1.3.1' 2022-05-12 21:23:52 -06:00
Nathan Chapman
28e6c9001b Merge tag 'v1.3.1' into develop
1.3.1 v1.3.1
2022-05-12 21:23:52 -06:00
Nathan Chapman
4f205cd504 Change link position and fix grammar 2022-05-12 21:23:24 -06:00
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