|
|
7710064a83
|
Change from active campaign to squareup
|
2024-01-03 13:41:47 -07:00 |
|
Nathan Chapman
|
e52c763234
|
Fix subscription checkout shipping calculation
|
2023-11-20 08:21:57 -07:00 |
|
|
|
f65169ebbc
|
Implement basic shipping with XPS Ship API
|
2023-11-17 22:31:21 -07:00 |
|
Nathan Chapman
|
520142fd62
|
Add xps integration
|
2023-11-17 18:59:06 -07:00 |
|
|
|
4b31688c25
|
Write own usps library
|
2023-11-16 19:30:54 -07:00 |
|
Nathan Chapman
|
7d0606143d
|
Fix price limit
|
2023-10-20 08:04:49 -06:00 |
|
|
|
88b5b4bc87
|
Merge branch 'master' into develop
|
2023-09-04 21:47:35 -06:00 |
|
|
|
f6eb763d4c
|
Merge branch 'release/3.6.4'
|
2023-09-04 21:44:04 -06:00 |
|
|
|
8cf25ec8c0
|
Revert "Update banner for sale"
This reverts commit 7462c676d5ebcef2fc5906b0be1b40673db03dae.
|
2023-09-04 21:40:14 -06:00 |
|
Nathan Chapman
|
607b35fbac
|
Merge branch 'hotfix/3.6.3'
|
2023-09-01 12:32:03 -06:00 |
|
Nathan Chapman
|
6ea1b821bc
|
Fix amount
|
2023-09-01 12:31:53 -06:00 |
|
Nathan Chapman
|
1f84389086
|
Merge tag '3.6.2' into develop
3.6.2 3.6.2
|
2023-09-01 07:58:13 -06:00 |
|
Nathan Chapman
|
8749b3a884
|
Merge branch 'release/3.6.2'
|
2023-09-01 07:58:12 -06:00 |
|
|
|
7462c676d5
|
Update banner for sale
|
2023-08-31 19:59:55 -06:00 |
|
|
|
d2811ddae7
|
Merge tag 'v3.6.1' into develop
3.6.1
|
2023-08-22 22:36:48 -06:00 |
|
|
|
f380094271
|
Merge branch 'hotfix/3.6.1'
|
2023-08-22 22:36:43 -06:00 |
|
|
|
52e62d6003
|
Fix carousel images and text
|
2023-08-22 22:36:35 -06:00 |
|
|
|
d88694f67c
|
Merge tag 'v3.6.0' into develop
3.6.0
|
2023-08-22 22:02:00 -06:00 |
|
|
|
64100af82d
|
Merge branch 'release/3.6.0'
|
2023-08-22 22:01:51 -06:00 |
|
|
|
a87b8f1db1
|
Merge branch 'feature/wholesale' into develop
|
2023-08-22 22:00:47 -06:00 |
|
|
|
b61114babb
|
Finalize wholesale orders
|
2023-08-22 21:59:08 -06:00 |
|
|
|
10cd9cf0c5
|
Update form
|
2023-08-22 21:59:08 -06:00 |
|
|
|
f5ae448c98
|
Add intermediary page for wholesale
|
2023-08-22 21:59:08 -06:00 |
|
Nathan Chapman
|
c598f805e2
|
Add base for wholesale orders
|
2023-08-22 21:59:08 -06:00 |
|
Nathan Chapman
|
e514d72c8d
|
Remove username field as it is no longer used
|
2023-08-17 08:44:56 -06:00 |
|
Nathan Chapman
|
10e4af2a7b
|
Merge branch 'release/3.5.1'
|
2023-08-02 12:15:37 -06:00 |
|
Nathan Chapman
|
499b95f74e
|
Merge tag '3.5.1' into develop
3.5.1 3.5.1
|
2023-08-02 12:15:37 -06:00 |
|
Nathan Chapman
|
ba6aa1039f
|
Update free-sample banner image
|
2023-08-02 12:15:03 -06:00 |
|
|
|
6a95facf9e
|
Merge branch 'release/3.5.0'
|
2023-07-31 20:31:45 -06:00 |
|
|
|
6a7ea43f79
|
Merge tag 'v3.5.0' into develop
3.5.0 v3.5.0
|
2023-07-31 20:31:45 -06:00 |
|
|
|
9884014229
|
Remove django-allauth and replace with basic user creation/login with just email
|
2023-07-31 20:04:49 -06:00 |
|
Nathan Chapman
|
b0ba350c14
|
Merge branch 'release/3.4.2'
|
2023-07-31 14:45:51 -06:00 |
|
Nathan Chapman
|
61f98295ee
|
Merge tag '3.4.2' into develop
3.4.2 3.4.2
|
2023-07-31 14:45:51 -06:00 |
|
Nathan Chapman
|
2bd2e35308
|
Add free sample banner
|
2023-07-31 14:44:52 -06:00 |
|
Nathan Chapman
|
105e3023ab
|
Merge branch 'hotfix/fix-make-password'
|
2023-07-24 08:09:08 -06:00 |
|
Nathan Chapman
|
111757be35
|
Merge tag 'fix-make-password' into develop
3.3.5 fix-make-password
|
2023-07-24 08:09:08 -06:00 |
|
Nathan Chapman
|
0e47679e9a
|
Fix wrong function call for auto-creating a new user
|
2023-07-24 08:08:51 -06:00 |
|
Nathan Chapman
|
b50b10208f
|
Merge branch 'hotfix/subscription-has-no-attr-address'
|
2023-07-17 08:05:25 -06:00 |
|
Nathan Chapman
|
41b898e942
|
Merge branch 'master' into develop
|
2023-07-17 08:05:25 -06:00 |
|
Nathan Chapman
|
468948a2c8
|
Correct shipping fields when creating an Order from a Subscription
|
2023-07-17 08:05:16 -06:00 |
|
|
|
71f7db9827
|
Merge tag 'v3.4.0' into develop
v3.4.0
|
2023-07-16 12:43:46 -06:00 |
|
|
|
adf275331c
|
Merge branch 'release/3.4.0'
|
2023-07-16 12:43:38 -06:00 |
|
|
|
e75f1dc1bc
|
Finish address template changes
|
2023-07-16 12:42:58 -06:00 |
|
|
|
cf4a1e5ec7
|
Add host name check in nginx conf
|
2023-07-14 23:04:41 -06:00 |
|
|
|
9108c7ea1a
|
Merge branch 'feature/remove-address-model' into develop
|
2023-07-14 23:02:51 -06:00 |
|
|
|
faf9b5b734
|
Remove address model and unnecessary apps
|
2023-07-14 22:59:03 -06:00 |
|
|
|
de329a5340
|
Move address to the User, Order, and Subscription models respectively
|
2023-07-14 21:04:20 -06:00 |
|
Nathan Chapman
|
c09184078a
|
Merge tag '3.3.4' into develop
3.3.4
|
2023-07-11 09:38:04 -06:00 |
|
Nathan Chapman
|
f6d15bd30c
|
Merge branch 'release/3.3.4'
|
2023-07-11 09:37:59 -06:00 |
|
Nathan Chapman
|
29950b4e6a
|
Add Terms and conditions and Privacy Policy
|
2023-07-11 09:37:14 -06:00 |
|
