raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-05 22:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,905 Commits 18 Branches 452 Tags
3a3fc066dca91e34ebf2b52074aac43de8fe72bf
Commit Graph

117 Commits

Author SHA1 Message Date
Jean-Baptiste Bellet
1e1ec95a5a Include payment form right after the payment description 
which is right after the radio input that select the payment description
 2022-12-28 15:24:46 +01:00
Jean-Baptiste Bellet
2d86e8857a Put payment method description just above the 
+ update spec by adding `data-paymentmethod-id` attribute
 2022-12-28 15:21:29 +01:00
Jean-Baptiste Bellet
f1bb4fdf38 Same display css rules for price of payment and shipping method 
+ update spec since parenthesis are added by css
 2022-12-28 15:21:29 +01:00
Jean-Baptiste Bellet
ca1a850d4a Show shipping method description just bellow the radio input 2022-12-28 15:21:29 +01:00
Jean-Baptiste Bellet
93e736fdf6 Use label as a placeholder that move above the input when focused 
Couldn't make a pure CSS version because of the way rails generates its errors (it add `<span />` over the element, either `input` or `label`, itself)
 2022-12-27 10:47:18 +01:00
Jean-Baptiste Bellet
988dcc6081 Use two columns for contact info and first/last name 
For small screen, it's a one column
 2022-12-27 10:46:59 +01:00
Jean-Baptiste Bellet
d43f0331ac Contact information section for email + phone number 
+ add first name and last name to the billing address section
 2022-12-27 10:46:38 +01:00
Jean-Baptiste Bellet
151e71b4d9 Actually controller is named dependEnt-select 2022-10-26 11:21:44 +02:00
Maikel Linke
4a0ed99919 Replace Paperclip on Enterprise model 
We configured Paperclip to convert images to JPG in some cases but I
omitted that here because we don't need it. If an image is better
represented as PNG or another format then the user should be able to
choose that.

Some specs were also testing the generated URL but the Active Storage
URL doesn't contain a style name anymore and it's not helpful to test
the URL.
 2022-06-01 17:16:55 +10:00
Jean-Baptiste Bellet
d942adcdd0 Change i18n key on first step 
Delivery address --> shipping info
 2022-05-11 10:11:51 +02:00
Jean-Baptiste Bellet
89aa76dbbc Handle long payment description with no space 2022-04-29 10:15:50 +02:00
Jean-Baptiste Bellet
99c0416cc7 Handle long shipping method description with no spaces 2022-04-28 10:40:28 +02:00
Filipe
f29dc3f978 Merge pull request #9009 from jibees/9007-already-opened-cart 
SplitCheckout: add already opened cart message on summary step when distributor allow order changes
 2022-04-01 13:29:34 +01:00
Filipe
c4fc8e9396 Merge pull request #8988 from jibees/8963-sc-display-save-shipping-address-as-default-checkbox 
SplitCheckout: Display checkbox that "save as default address" on the /details page
 2022-03-31 16:43:52 +01:00
filipefurtad0
843f57ad4f Removes checkbox attributes 2022-03-29 22:29:43 +01:00
filipefurtad0
95b1911f38 Hides the default address checkbox for guest customers 2022-03-29 22:09:39 +01:00
jibees
9a5318965c Use as an helper 
Co-Authored-By: Maikel <maikel@email.org.au>
 2022-03-24 09:11:58 +01:00
Jean-Baptiste Bellet
df6cd5b266 Add already ordered panel only on summary step 2022-03-17 16:47:16 +01:00
Jean-Baptiste Bellet
ac361d3b64 Add already_opened on each step 2022-03-17 16:47:16 +01:00
Jean-Baptiste Bellet
bcf6c7984e Display checkbox that "save as default address" 2022-03-14 09:05:45 +01:00
Jean-Baptiste Bellet
60ad92c4ff Display ship address options checkboxes 
+ Create the associated test: the trick is is that the selected delivery method is the one that required address **and** is before others that do not required ship address
 2022-03-10 15:55:10 +01:00
Filipe
4dbf047647 Merge pull request #8871 from jibees/8827-preselect-shipping-method 
SplitCheckout: preselect the shipping/payment method if the only one available
 2022-02-17 10:54:20 +00:00
Jean-Baptiste Bellet
012e91879a preselect the only available shipping method 2022-02-17 09:33:23 +01:00
Jean-Baptiste Bellet
7be2f418d0 preselect the only available payment method 2022-02-17 09:33:23 +01:00
Jean-Baptiste Bellet
43cd604405 Update to the right link the "Back to Payment method" button 
+ create a spec as well
 2022-02-11 15:01:53 +01:00
Filipe
c4751d7056 Merge pull request #8813 from Matt-Yorkley/split-checkout-address-state 
Split checkout: fix loading of saved addresses
 2022-02-03 19:06:35 +00:00
Jean-Baptiste Bellet
ae0a71b29d This row adds an extra space on the right of the page 
which introduce an horizontal scroll: visual regression
 2022-01-31 11:47:21 +01:00
Jean-Baptiste Bellet
d8391aa1d3 Create a div with a special class (checkout-step3) 
... and attach the controller to it

Add the T&Cs inside the sicked container with submit buttons
 2022-01-31 11:31:32 +01:00
Jean-Baptiste Bellet
3abef1b703 Specify css for this sticky container 
with a nice box-shadow.
Handle special case for mobile view (ie. max width 700px)
 2022-01-31 11:31:32 +01:00
Matt-Yorkley
5e321c9f48 Fix country/state selection for shipping address; missing controller and data 2022-01-30 11:33:31 +00:00
Matt-Yorkley
611beb2e90 Rearrange controller placement, field order, and nesting 2022-01-30 11:33:31 +00:00
Matt-Yorkley
370ec17818 Improve countries and states loading 2022-01-30 11:33:31 +00:00
Matt-Yorkley
0bec693655 Merge pull request #8791 from Matt-Yorkley/split-checkout-terms 
[Split Checkout] Update terms of service handling
 2022-01-27 13:07:04 +00:00
Filipe
cea4714296 Merge pull request #8761 from Dmoment/8457-missng-translation-or-between-buttons 
removed translation or between buttons
 2022-01-26 10:04:41 +00:00
Filipe
30b3b7455d Merge pull request #8717 from jibees/6139-improve-radio-button-on-split-checkout 
SplitCheckout: adjust display of long shipping method or payment method label
 2022-01-25 16:32:38 +00:00
Filipe
8715e9865b Merge pull request #8643 from jibees/8623-disable-save-card-option 
Split Checkout: Show "Save card for future use" checkbox only on "Enter new card details" option selected
 2022-01-25 16:11:20 +00:00
Matt-Yorkley
6e8bb777e6 Show platform and distributor terms and conditions 2022-01-25 15:16:43 +00:00
Matt-Yorkley
b5a1d9ebef Allow using saved cards at checkout 2022-01-24 23:06:43 +00:00
Deepak Chauhan
5a6f322fd7 Merge branch 'master' into 8457-missng-translation-or-between-buttons 2022-01-20 15:41:15 +05:30
Deepak Chauhan
45660b48bb removed or from admin/show_more.html.haml and split_checkout/_guest.html.haml 2022-01-20 15:35:58 +05:30
Filipe
2e85783465 Merge pull request #8731 from Matt-Yorkley/split-checkout-default-addresses 
Split checkout: default address saving
 2022-01-19 17:43:51 +00:00
Filipe
7444e2d2f3 Merge pull request #8741 from Matt-Yorkley/guest-checkout-login 
Fix split checkout guest user login
 2022-01-19 16:43:24 +00:00
Matt-Yorkley
8f37aa71f2 Save default addresses when requested during checkout 2022-01-19 13:40:33 +00:00
Matt-Yorkley
fb00a51ae8 Merge pull request #8653 from Matt-Yorkley/split-checkout-t-and-c 
Split checkout T&Cs
 2022-01-19 13:39:15 +00:00
Matt-Yorkley
21ed136e00 Enable opening login modal via broadcasted DOM Event 2022-01-19 13:14:10 +00:00
Matt-Yorkley
8ce27bed86 Move guest checkout handling to the frontend 2022-01-19 13:14:10 +00:00
filipefurtad0
e7aa19c95d Fixes translation/rendering inconsistency on Country label(step 3) 2022-01-15 19:43:57 +00:00
Jean-Baptiste Bellet
f78ff3fc3b Improve display when label is long 
(ie. longer than the available screen width)
 2022-01-13 11:05:44 +01:00
Matt-Yorkley
f8efff9a4e Don't show terms of service unless required 2022-01-12 22:17:22 +00:00
Jean-Baptiste Bellet
2568d775ae Create the guest view and its associated css 2022-01-10 09:39:46 +01:00