Filipe
53d1994b2a
Merge pull request #8956 from Matt-Yorkley/welsh-javascript-fixes
...
Fix Angular interpolation for translations with apostrophes
2022-03-07 12:23:04 +00:00
Matt-Yorkley
6729119489
Fix Angular interpolation for translations with apostrophes
2022-03-03 20:59:04 +00: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
Filipe
d052c4f8a4
Merge pull request #8869 from filipefurtad0/remove_signup_string
...
Removes signup string from private shop login screen
2022-03-01 08:20:06 +00:00
Filipe
28ac9d980c
Merge pull request #8849 from jibees/render-pdf-with-stylesheet
...
Create a new method pdf_stylesheet_pack_tag that actually include CSS in PDF files
2022-02-21 23:09:21 +00:00
Filipe
9966b5b33c
Merge pull request #8565 from jibees/8171-group-by-imperial-unit
...
Handle imperial units in the Bulk Order Management interface
2022-02-21 14:47:38 +00:00
filipefurtad0
cefd5db6eb
Renames require_login_3_html key
2022-02-18 11:07:37 +00:00
filipefurtad0
27bc5805ae
Removes signup string from private shop login screen
2022-02-17 13:19:31 +00:00
Matt-Yorkley
9a27addd14
Merge pull request #8763 from openfoodfoundation/8577-split-name-column-in-customers-table
...
Split name column in customers table
2022-02-17 11:57:01 +00: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
François Turbelin
23776c7a3e
Fix more specs
2022-02-16 10:23:23 +11:00
Adrien Chauve
ca46359224
More fixes
2022-02-16 10:23:22 +11: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
d8936b412e
Merge pull request #8819 from apricot12/8694-Improve_subsvriptions_index_perfomance
...
8694 improve subscriptions index perfomance by eager loading tags, suppliers and exchanges.
2022-02-10 17:37:00 +00:00
Jean-Baptiste Bellet
92cd918e5a
Add LoginModal as controller + connect action to open login modal
2022-02-10 09:52:13 +01:00
Jean-Baptiste Bellet
a951fd2c06
Create a new method pdf_stylesheet_pack_tag that actually include CSS file
...
If running in developpement (ie. `Webpacker.dev_server.running?`), use webpacker to actually render/serve the CSS files.
Source: https://stackoverflow.com/a/60541688
2022-02-09 11:21:50 +01:00
Matt-Yorkley
1c180299a5
Pass indexed payment method tags to PaymentMethod Serializer
2022-02-08 11:42:24 +00:00
Filipe
e403fc171d
Merge pull request #8808 from Matt-Yorkley/login-modal
...
Remove all Angular code from Login/Signup process
2022-02-03 19:36:44 +00: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
Filipe
998f7afdc4
Merge pull request #8523 from seballot/progress-for-ajax-request
...
Improve loading spinner display
2022-02-01 10:03:04 +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
77d8e7da90
Use non-Angular login modal in /registration pages
2022-01-29 14:49:23 +00:00
Matt-Yorkley
0577b46f3f
Create simpler non-Angular login modal
2022-01-29 14:49:23 +00:00
Matt-Yorkley
04da148af0
Decouple login modal opening from Angular
2022-01-29 10:08:51 +00:00
Matt-Yorkley
6561a7246b
Delete unused partial
2022-01-29 10:08:51 +00:00
Filipe
49030049dd
Merge pull request #8732 from Matt-Yorkley/template-cull
...
Remove some Angular templates
2022-01-27 15:18:06 +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
75395f6f29
Merge pull request #8648 from Matt-Yorkley/csp
...
Configure CSP
2022-01-26 19:55:11 +00:00
Filipe
28a126024f
Merge pull request #8722 from cillian/remove-unused-js-from-products-form
...
Remove unused inline JavaScript from products/_form.html.haml
2022-01-26 19:14:24 +00:00
Filipe
53b96896a9
Merge pull request #8779 from mkllnk/7872-remove-stripe-connect
...
Upgrade old Stripe Connect payment methods to Stripe SCA and remove Stripe Connect
2022-01-26 11:57:26 +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
Matt-Yorkley
48a7cfa09e
Fix more deprecated keyword arguments
2022-01-24 14:11:08 +00:00
Filipe
1ddff2c4bf
Merge pull request #8678 from Matt-Yorkley/dead-code-js-uri
...
Remove outdated jsUri
2022-01-24 13:15:02 +00:00
Filipe
f17226ffbe
Merge pull request #8438 from cillian/show-out-of-stock-line-items
...
If an order has out of stock line items display them and let admins remove them
2022-01-24 12:18:19 +00:00
Maikel Linke
ee85b9654d
Remove references to StripeConnect class
2022-01-24 12:35:45 +11: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
Deepak Chauhan
018e19c2c8
removed translation or from _edit_resourse_link to prevent rspec failing
2022-01-20 13:05:05 +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
