raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-11 03:40:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,254 Commits 16 Branches 456 Tags
45db61be53c047cbdaaf2aa4bbdfbb6aefb35bbe
Commit Graph

165 Commits

Author SHA1 Message Date
David Cook
0966864589 Merge pull request #11511 from dacook/fix-update-button-11349 
Fix Update button sizing
 2023-09-14 13:37:19 +10:00
David Cook
2e6e083667 [fixup] Fix Update button sizing 
By disabling line wrap we can consistently predict how it will appear. The longest translation we currently have is 14 characters so this should be fine.
 2023-09-14 09:37:10 +10:00
David Cook
99da60921f Fix Update button sizing 
This was broken when upgrading [Foundation](https://github.com/openfoodfoundation/openfoodnetwork/pull/11349). For some reason the button.expand class now sets larger font size and padding, which overrides the button.small class. It's probably a bug but we'll have to work around it.
 2023-09-08 10:20:26 +10:00
Neal Chambers
b1e40ed605 Fix Rails/HelperInstanceVariable 2023-09-06 22:36:46 +09:00
Matt-Yorkley
28795effc3 Clarify named vouchers in UI 2023-07-04 13:13:05 +01:00
Matt-Yorkley
b9431cd121 Remove data-hook attributes 2023-04-28 13:03:13 +01:00
Jean-Baptiste Bellet
b559171d0e Put order summary footer into its own file _totals_footer.html.haml 2023-01-20 11:20:35 +01:00
Jean-Baptiste Bellet
c99ec38c85 By default, we reject all adjustements with amount equal to 0 2023-01-20 11:20:35 +01:00
Jean-Baptiste Bellet
99fcbad0f0 On split checkout, do not display footer on order summary 
introduced via `display_footer` which is by default `true`
 2023-01-20 11:20:34 +01:00
binarygit
3b179e75a4 Stop horizontal scroll on body in cart page 2022-12-19 21:30:31 +05:45
Jean-Baptiste Bellet
8b89c901ef Do not display "Admin and Handling" ie. fees total 2022-10-08 10:00:57 +02:00
Jean-Baptiste Bellet
72df2867d4 Remove admin_and_handling merging 
+ update specs as well
 2022-10-08 10:00:57 +02:00
Jean-Baptiste Bellet
bf40e59bec Should link to order.distributor website 
- order: the order summary the customer is seeing on this page
 - current_order: the order is the customer is check-outing

+ add specs
 2022-06-13 14:52:20 +02:00
Filipe
6ff2d4a9d5 Merge pull request #9109 from apricot12/8917-Link-to-enterprise-site 
Adding a link to enterprise's own site from Order confirmation page.
 2022-06-02 17:59:03 +01:00
Nihal Mohammed
f5ecc6ffe4 Change gap between columns to fit new button 2022-05-09 23:29:40 +05:30
Nihal Mohammed
af58ba523c Renamed groups_helper to link_helper and removed strip_url method, as well as updated specs and ApplicationHelper. Added "Back To Website" button and i18n. 2022-04-26 01:38:25 +05:30
Jean-Baptiste Bellet
9306e054b8 Unless order is complete, /cart could be updated 
Split_checkout introduced new state for an order

Update specs as well

Follow up #8944
 2022-04-21 14:22:39 +02:00
Jean-Baptiste Bellet
2976b0717c Display "Update" button on the order table page unless order is complete 
With the split checkout, we can access this page between the different steps: for this cases, cart actions should be displayed
 2022-03-01 10:11:27 +01:00
Matt-Yorkley
f4c86a1b51 Merge pull request #8061 from Matt-Yorkley/turbo-checkout 
Split Checkout new toys
 2021-09-17 10:48:59 +02:00
Matt-Yorkley
1d5077061e Remove andand 
This old gem implemented some functionality for handling nils which is no longer needed, as it's provided natively by Ruby with the &. operator.
 2021-09-08 14:28:31 +01:00
Matt-Yorkley
086c5ab264 Replace directive with data-confirm 2021-09-08 10:34:34 +01:00
Matt-Yorkley
03863d2bb2 Delete some other dead frontend code 2021-07-18 11:25:01 +01:00
Jean-Baptiste Bellet
e3f56556cf Remove feature toggle around unit_price and enable it 2021-06-07 20:53:45 +02:00
Matt-Yorkley
ecb4cb31ad Merge pull request #7599 from Matt-Yorkley/cart-rendering 
Move line item rendering to a collection in cart page
 2021-05-25 13:37:50 +02:00
Luis Ramos
90db52e5f5 Fix route 2021-05-14 00:14:02 +01:00
Matt-Yorkley
122ba385f7 Move line item rendering to collection in cart page 
Improvement from upstream Spree commit. Brings a big performance boost to rendering, especially with larger numbers of items in the cart. 50%+ reduction in rendering times reported.
 2021-05-10 11:50:31 +01:00
Andy Brett
2c17d12f6e Merge pull request #7303 from drummer83/independent-update-cart-label 
Independent 'update cart' label
 2021-04-06 10:59:06 -07:00
Konrad
7c47102869 Use new independent label for 'update cart' 
orders_form_update_cart
 2021-04-01 23:30:00 +02:00
Jean-Baptiste Bellet
0ea085a275 Add unit prices for already bought product in cart page 2021-03-26 09:49:28 +01:00
Matt-Yorkley
526794b32e Refactor CheckoutHelper 2021-03-18 13:18:20 +00:00
Matt-Yorkley
11d5c6a2f1 Update untranslated string 
This translation already exists, we just weren't using it in this view.
 2021-03-09 17:19:40 +00:00
Matthew Rieger
651bdad7b9 Fix users removing last item of confirmed order on /cart page 2021-03-01 20:42:05 -08:00
Jean-Baptiste Bellet
ee4943f6e2 Display unit price on /cart page 
- Use a new class to specify css customization
 - Add to `line_item.rb` a fake method: `unit_price_price_and_unit` @andrewpbrett will change it with real values.
 - Add a new variable: $text-xs to specify small font-size


squash "Display unit price on /cart page"
 2021-02-18 15:02:30 +01:00
Luis Ramos
f3da7afd55 Replace spree_order_path with order_path so we can use scope in the routes file 2021-01-25 19:55:42 +00:00
Luis Ramos
6e7ee02191 Change spree.order_path to spree_order_path everywhere 2021-01-25 19:52:48 +00:00
Luis Ramos
399fe2c01b Make code work for relations and arrays 2020-10-30 10:12:56 +00:00
Luis Ramos
ff9133b7aa Merge pull request #5699 from coopdevs/fix-order-button-radius 
Make button border radius consistent
 2020-07-03 23:01:14 +01:00
Matt-Yorkley
8fc407a9d5 Extract repeated variant thumbnail code to a shared partial 2020-07-02 18:36:43 +02:00
Matt-Yorkley
eeb6c57f99 Update missing image paths in other order views 2020-07-02 18:36:27 +02:00
Pau Perez
c892f9c69b Make button border radius consistent 2020-06-29 12:01:59 +02:00
Matt-Yorkley
886df0e87d Fix cart page button style regression 2020-06-18 22:21:55 +02:00
Matt-Yorkley
fe27c8466e Add feature specs for full cart page stock correction process 2020-05-18 14:51:11 +02:00
Matt-Yorkley
63e4430ea4 Update cart page links to be disabled when changes are required and form is unsaved 
See: https://stackoverflow.com/questions/23425254/enable-disable-anchor-tags-using-angularjs
 2020-05-18 14:51:08 +02:00
Matt-Yorkley
c2efa901c2 Don't highlight update button when form is invalid 2020-05-15 13:38:17 +02:00
Matt-Yorkley
3ba1182661 Dynamically mark quantity field as invalid when stock is incorrect 2020-05-15 12:59:29 +02:00
Matt-Yorkley
42195b76d3 Highlight update button when cart page form is "dirty" 2020-05-15 12:59:29 +02:00
Matt-Yorkley
73b533690e Refactor cart update button syntax 2020-05-15 12:59:29 +02:00
Matt-Yorkley
78f736db45 Add red border on quantity field when it must be updated 2020-05-15 12:59:28 +02:00
Matt-Yorkley
0414f4984d Align buttons left and right on cart page 2020-04-08 10:55:55 +02:00
Matt-Yorkley
9c421e146e Remove arrows from cart and checkout buttons 2020-04-08 10:23:18 +02:00