Commit graph

256 commits

Author SHA1 Message Date
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
068cc9b12d Merge branch 'shop-locations-with-inventory' into 'master'
Buttons for new shop locations

See merge request engineering/make-post-sell/make_post_sell!11
2024-06-19 17:32:24 +00:00
7ee12d3392 Buttons for new shop locations
modified:   make_post_sell/routes.py
	modified:   make_post_sell/templates/actions_new.j2
	modified:   make_post_sell/templates/actions_view.j2
	modified:   make_post_sell/views/shop_location.py
2024-06-19 13:30:18 -04:00
29bcc12ea5 Merge branch 'shop-locations-with-inventory' into 'master'
stub in new shop_location and inventory models testing CodeRabbit

See merge request engineering/make-post-sell/make_post_sell!10
2024-06-19 16:39:08 +00:00
3ca8ca1190 refactor cart_checkout logic ordering to keep people on the cart page
for as long as needed to get a valid cart before asking for address or
billing.

	modified:   make_post_sell/views/cart.py
2024-06-19 11:17:20 -04:00
6b471b6ecd keep track of next for main log in button.
Allow coupons to be removed from session carts which do not have a user
or owner associated.

	modified:   make_post_sell/templates/base.j2
	modified:   make_post_sell/views/coupon.py
2024-06-19 10:47:50 -04:00
f169d23aad make sure we can clone carts and merge all attributes into new cart.
modified:   make_post_sell/models/cart.py
	modified:   make_post_sell/routes.py
	modified:   make_post_sell/templates/cart.j2
	modified:   make_post_sell/templates/join-or-log-in.j2
	modified:   make_post_sell/templates/verification-challenge.j2
	modified:   make_post_sell/views/__init__.py
	modified:   make_post_sell/views/authentication.py
	modified:   make_post_sell/views/cart.py
2024-06-19 10:13:50 -04:00
62283edffd Only allow carts without owners to be modified by unauthenticated users.
If a cart has an owner, only the owner can make changes to it.

	modified:   make_post_sell/views/cart.py
2024-06-17 18:43:02 -04:00
c9460d10ed make carts private again... lol
modified:   make_post_sell/views/cart.py
2024-06-16 22:35:29 -04:00
597ac4938b fixup shop_location_form template
modified:   make_post_sell/templates/shop_location_form.j2
2024-06-16 21:58:11 -04:00
83d73c3f23 new route for invoices protected requires user and user to match invoice
or user must be editor of invoice shop
	modified:   make_post_sell/models/invoice.py
	modified:   make_post_sell/routes.py
	new file:   make_post_sell/templates/invoice.j2
	new file:   make_post_sell/views/invoice.py
2024-06-16 21:44:29 -04:00
3d0ad9f1be make sure to add the delivery_address to invoice on successful checkout
modified:   make_post_sell/views/cart.py
2024-06-16 20:39:11 -04:00
8e9d704f60 remove items from successful physical purchase.
modified:   make_post_sell/models/cart.py
	modified:   make_post_sell/models/invoice.py
	modified:   make_post_sell/views/cart.py
2024-06-16 20:11:49 -04:00
03e61e9863 refactor to make sure we ask user for address if physical products in
cart.

	modified:   make_post_sell/models/cart.py
	modified:   make_post_sell/views/cart.py
	modified:   make_post_sell/views/shop_location.py
2024-06-16 17:59:21 -04:00
660e6d7ed6 save handling option in frontend and recalculate handling when shop is
switched.

	modified:   templates/cart.j2
	modified:   views/cart.py
	modified:   views/shop_location.py
2024-06-16 15:49:45 -04:00
60b495b36a Handling selection and cost now seem to work.
only thing next is blocking if there is a need for handling options and
user needs address.

	modified:   make_post_sell/models/cart.py
	modified:   make_post_sell/models/inventory.py
	modified:   make_post_sell/models/invoice.py
	modified:   make_post_sell/routes.py
	new file:   make_post_sell/scripts/alembic/versions/1b3ecdde9e65_handling_options.py
	modified:   make_post_sell/templates/cart.j2
	modified:   make_post_sell/views/cart.py
2024-06-16 14:33:21 -04:00
e5c49e5347 Shop Locations - fast switcher
modified:   make_post_sell/templates/base.j2
2024-06-09 17:06:02 -04:00
b4698efb99 modified: make_post_sell/views/shop_location.py 2024-06-09 16:34:31 -04:00
6706223f17 allow users without being logged in to switch shop locations
modified:   make_post_sell/templates/product.j2
	modified:   make_post_sell/templates/shop_locations.j2
	modified:   make_post_sell/views/shop_location.py
2024-06-09 11:00:19 -04:00
8705842e45 prevent adding to cart if no inventory at shop_location
modified:   make_post_sell/models/shop_location.py
	modified:   make_post_sell/request_methods.py
	modified:   make_post_sell/routes.py
	modified:   make_post_sell/templates/product.j2
	modified:   make_post_sell/templates/shop_locations.j2
	modified:   make_post_sell/views/shop_location.py
2024-06-08 20:30:17 -04:00
6055eed135 flash when shop location is switched. 2024-06-08 19:43:44 -04:00
f218e30ad9 fix inventory management
modified:   make_post_sell/views/product.py
2024-06-08 19:26:04 -04:00
0b7e643976 Better sql query for product inventories
modified:   make_post_sell/models/product.py
	modified:   make_post_sell/routes.py
	modified:   make_post_sell/templates/shop_locations.j2
	modified:   make_post_sell/views/product.py
	modified:   make_post_sell/views/shop.py
	modified:   make_post_sell/views/shop_location.py
2024-06-08 18:29:16 -04:00
2e79f44089 More work for physical products
modified:   make_post_sell/models/product.py
	modified:   make_post_sell/routes.py
	modified:   make_post_sell/templates/product.j2
	modified:   make_post_sell/templates/product_edit.j2
	modified:   make_post_sell/templates/product_new.j2
	modified:   make_post_sell/templates/shop_products.j2
	modified:   make_post_sell/views/__init__.py
	modified:   make_post_sell/views/authentication.py
	modified:   make_post_sell/views/billing.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
	modified:   make_post_sell/views/shop_location.py
	modified:   make_post_sell/views/user.py
2024-06-08 17:19:10 -04:00
505947fd6b GPT-4 helped me stub in the forms for creating and updating shop
locations
	modified:   make_post_sell/routes.py
	modified:   make_post_sell/templates/actions_view.j2
	new file:   make_post_sell/templates/shop_location_form.j2
	new file:   make_post_sell/templates/shop_locations.j2
	new file:   make_post_sell/views/shop_location.py
2024-06-08 13:15:58 -04:00
3452cf7a58 modified: make_post_sell/models/shop_location.py 2024-06-08 12:04:14 -04:00
c17c4bf2e4 modified: make_post_sell/models/shop_location.py 2024-06-08 11:51:18 -04:00
a1037a54e8 more fields for shop_location
modified:   make_post_sell/models/shop_location.py
	new file:   make_post_sell/scripts/alembic/versions/ddfbd6d96915_shop_location_rates_and_hours.py
2024-06-08 11:45:39 -04:00
47be09817f remove unneeded references.
modified:   make_post_sell/models/inventory.py
	modified:   make_post_sell/models/shop_location.py
2024-06-08 10:26:35 -04:00
8af327bed1 migration scripts for adding new tables and fields.
modified:   make_post_sell/models/__init__.py
	modified:   make_post_sell/models/inventory.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/shop_location.py
	new file:   make_post_sell/scripts/alembic/versions/cc6211ec360e_physical_products_shop_locations_and_.py
2024-06-08 10:14:51 -04:00
9dd56e0898 register new tables with ORM
modified:   make_post_sell/models/meta.py
2024-06-05 13:28:43 -04:00