Commit graph

186 commits

Author SHA1 Message Date
2f4bfaca92 Merge branch 'only-one-coupon-per-transaction' into 'master'
No coupon stacking, only one per transaction

See merge request engineering/make-post-sell/make_post_sell!27
2024-06-25 23:29:57 +00:00
7fb5e4ee55 No coupon stacking, only one per transaction 2024-06-25 23:29:57 +00:00
bbd1ec3608 Merge branch 'ticket-25' into 'master'
fixes ticket #25 bundle products are working and safer now!

See merge request engineering/make-post-sell/make_post_sell!26
2024-06-25 22:12:28 +00:00
477d6c2dd0 fixes ticket #25 bundle products are working and safer now! 2024-06-25 22:12:27 +00:00
15669db0df fix shop uesrs view when email param is missing
modified:   make_post_sell/views/shop.py
2024-06-25 16:38:39 -04:00
123dd2d145 Merge branch 'formatting-big-numbers' into 'master'
use comas in big numbers throughout codebase

See merge request engineering/make-post-sell/make_post_sell!25
2024-06-25 14:34:41 +00:00
dace1684c8 use comas in big numbers throughout codebase 2024-06-25 14:34:40 +00:00
e81f42c59f small description
modified:   make_post_sell/templates/shop_location_form.j2
2024-06-25 09:34:17 -04:00
adeedfd9c4 modified: make_post_sell/views/coupon.py 2024-06-25 09:21:27 -04:00
6b041e7934 Merge branch 'ticket-27' into 'master'
coupons max date ten years in future.

Closes #27

See merge request engineering/make-post-sell/make_post_sell!24
2024-06-25 13:17:35 +00:00
49571ffb66 coupons max date ten years in future. 2024-06-25 13:17:35 +00:00
09dd9afa12 Merge branch 'ticket-24' into 'master'
strip() strings from frontend and fix coupon validation error

Closes #24

See merge request engineering/make-post-sell/make_post_sell!22
2024-06-25 00:22:03 +00:00
1c9dc02e68 strip() strings from frontend and fix coupon validation error 2024-06-25 00:22:02 +00:00
a9599634ff Merge branch 'ticket-23' into 'master'
use regex to protect domain name.

Closes #23

See merge request engineering/make-post-sell/make_post_sell!23
2024-06-24 23:50:14 +00:00
0d555117d3 modified: make_post_sell/views/shop.py 2024-06-24 19:46:25 -04:00
d72b951a54 do not allow duplicate domain names in the system
modified:   make_post_sell/views/shop.py
2024-06-24 19:41:34 -04:00
9c2c998b32 use regex to protect domain name.
fixes #23

	modified:   make_post_sell/views/shop.py
2024-06-24 19:06:48 -04:00
ab9c31d8c9 Merge branch 'ticket-28' into 'master'
fixes coupons to better support percentages.

Closes #28

See merge request engineering/make-post-sell/make_post_sell!21
2024-06-24 15:24:04 +00:00
586c770bbf fixes coupons to better support percentages. 2024-06-24 15:24:04 +00:00
35114e0514 fix invite page to see new email roles right away.
modified:   make_post_sell/models/shop.py
	modified:   make_post_sell/views/shop.py
2024-06-24 09:07:57 -04:00
f1f1465fd5 Merge branch 'ticket-21' into 'master'
use regex to validate emails invited on shop user screen

Closes #21

See merge request engineering/make-post-sell/make_post_sell!20
2024-06-23 23:28:46 +00:00
b76a9b05cb use regex to validate emails invited on shop user screen 2024-06-23 23:28:46 +00:00
0b2109e9ab Merge branch 'ticket-18' into 'master'
fixes #18 issue, protect shop name from invalid chars

Closes #18

See merge request engineering/make-post-sell/make_post_sell!19
2024-06-23 21:58:38 +00:00
dcf98c61af fixes #18 issue, protect shop name from invalid chars 2024-06-23 21:58:38 +00:00
e3976a784d add * to required fields
modified:   make_post_sell/templates/content_new.j2
	modified:   make_post_sell/templates/product_new.j2
2024-06-23 17:33:34 -04:00
c9fb28777d make stripe image smaller
modified:   make_post_sell/templates/snippets/stripe.j2
2024-06-23 17:06:04 -04:00
4e6503d589 Merge branch 'ticket-16' into 'master'
coupons cannot have 0 or negative numbers anymore.

Closes #16 and #20

See merge request engineering/make-post-sell/make_post_sell!18
2024-06-23 20:54:44 +00:00
0bd2f2eb98 coupons cannot have 0 or negative numbers anymore. 2024-06-23 20:54:44 +00:00
06618b9cd2 try to fix memopoly.com
modified:   make_post_sell/models/product.py
	modified:   make_post_sell/views/product.py
2024-06-23 11:09:41 -04:00
98895188cc Merge branch 'develop' into 'master'
Display error message when uploading no files picked.

Closes #15

See merge request engineering/make-post-sell/make_post_sell!17
2024-06-23 14:50:01 +00:00
eebb5a9f15 Display error message when uploading no files picked. 2024-06-23 14:50:01 +00:00
71f20d5a8c Merge branch 'develop' into 'master'
fix regression content, it wasn't submitting properly before.

See merge request engineering/make-post-sell/make_post_sell!16
2024-06-23 03:05:34 +00:00
b8567d295a fix content, it wasn't submitting properly before.
modified:   make_post_sell/templates/content_new.j2
	modified:   make_post_sell/views/product.py
2024-06-22 22:31:20 -04:00
f5e41f74e0 Merge branch 'ticket-14' into 'master'
make product or content edit page support both better

Closes #14

See merge request engineering/make-post-sell/make_post_sell!15
2024-06-23 02:00:58 +00:00
839336cbff make product or content edit page support both better 2024-06-23 02:00:58 +00:00
d9c1bd2c35 Merge branch 'ticket-13' into 'master'
fix issue with price when not valid float

Closes #13

See merge request engineering/make-post-sell/make_post_sell!14
2024-06-23 01:59:16 +00:00
54ef59c8e5 fix issue with price when not valid float 2024-06-23 01:59:16 +00:00
e2faed62c5 by default img tags will have a style width of 100%
modified:   make_post_sell/static/css/common.css
2024-06-22 13:34:26 -04:00
556c63298d messing with playwright
modified:   journal.rst
2024-06-22 11:47:09 -04:00
1126485acd Merge branch 'only-show-available-buttons-for-shop-editor' into 'master'
Only show available buttons for shop editors

See merge request engineering/make-post-sell/make_post_sell!13
2024-06-21 23:48:15 +00:00
153ae6f245 Only show available buttons for shop editors 2024-06-21 23:48:14 +00:00
712a77d7e0 fixup invite link to automatically ask for verification token on click.
modified:   lib/mail.py
2024-06-20 18:07:08 -04:00
8cc3aff705 Merge branch 'black' into 'master'
black

See merge request engineering/make-post-sell/make_post_sell!12
2024-06-20 19:50:07 +00:00
573552f5ca modified: models/user_address.py 2024-06-19 19:13:01 -04:00
ce7d23104c changes per @coderabbit
modified:   models/invoice.py
	modified:   models/market.py
	modified:   models/stripe_user_shop.py
	modified:   models/user_product.py
2024-06-19 19:05:01 -04:00
e109aebe19 black
modified:   lib/currency.py
	modified:   models/invoice.py
	modified:   models/market.py
	modified:   models/shop_location.py
	modified:   models/stripe_user_shop.py
	modified:   models/user_address.py
	modified:   models/user_product.py
	modified:   models/user_shop.py
	modified:   views/invoice.py
2024-06-19 18:36:45 -04:00
63842d0232 prompt for email if user not logged in and trying to get to settings
modified:   make_post_sell/tests/test_functional.py
	modified:   make_post_sell/views/misc.py
	modified:   make_post_sell/views/user.py
2024-06-19 15:06:43 -04:00
14708b3dda fix test
modified:   make_post_sell/tests/test_functional.py
2024-06-19 14:41:38 -04:00
7053c57c41 prompt nicely for email when creating a new shop
modified:   make_post_sell/views/shop.py
2024-06-19 14:31:14 -04:00
f820210bb7 flynt and black
flynt turns python string format into f strings.

	modified:   make_post_sell/lib/hex_color.py
	modified:   make_post_sell/lib/mail.py
	modified:   make_post_sell/lib/sanitize_html.py
	modified:   make_post_sell/models/coupon.py
	modified:   make_post_sell/models/meta.py
	modified:   make_post_sell/models/product.py
	modified:   make_post_sell/models/shop.py
	modified:   make_post_sell/models/user.py
	modified:   make_post_sell/tests/test_functional.py
	modified:   make_post_sell/views/authentication.py
	modified:   make_post_sell/views/cart.py
	modified:   make_post_sell/views/content.py
	modified:   make_post_sell/views/coupon.py
	modified:   make_post_sell/views/product.py
	modified:   make_post_sell/views/shop.py
2024-06-19 13:57:23 -04:00