Commit Graph

12827 Commits

Author SHA1 Message Date
filipefurtad0
e7aa19c95d Fixes translation/rendering inconsistency on Country label(step 3) 2022-01-15 19:43:57 +00:00
Cillian O'Ruanaidh
22a48de033 Remove unused code for currency select menu which no longer exists
This removes inline JavaScript for #8699. This code was for the old currency select menu which was removed in 4839b7bd63
2022-01-14 12:33:30 +00:00
Filipe
7709e86d41 Merge pull request #8676 from jibees/8668-split-checkout-as-guest
Handle checkout as guest feature on split checkout
2022-01-12 20:22:01 +00:00
Filipe
cc0de4618c Merge pull request #8692 from jibees/8691-make-first-name-and-last-name-fields-mandatory
Validate the presence of first/last name if there is no company
2022-01-12 19:48:35 +00:00
Filipe
d66dac4ccb Merge pull request #8621 from apricot12/Unit-value-shop-front
Update units when variant unit name is edited
2022-01-11 17:41:20 +00:00
Filipe
4978c95e75 Merge pull request #8467 from SarvarKh/validate-social-links
Fix the issue with 'at' in enterprise twitter and instagram
2022-01-11 12:53:11 +00:00
Filipe
f2b14beea9 Merge pull request #8541 from jibees/8506-improve-shiped-email
Improve shipped email design
2022-01-11 11:36:32 +00:00
Filipe
da703b2d95 Merge pull request #8615 from jibees/8559-enable-sort-orders-by-order-full-name
Enable sorting orders by order full name
2022-01-11 11:27:36 +00:00
Jean-Baptiste Bellet
1a270af82b Test the presence of the firstname and the lastname if company is not present
Co-Authored-By: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
2022-01-11 10:30:45 +01:00
Jean-Baptiste Bellet
36db396fe5 Do not redirect if user is logged in 2022-01-10 10:02:08 +01:00
Jean-Baptiste Bellet
9a74934f79 Do not redirect to /guest if step is specified 2022-01-10 09:40:16 +01:00
Jean-Baptiste Bellet
b1524aa0bd Guard clause: redirect to /guest when POST
When there is no connected user, and when the distributor doesn't allow guest orders, redirect on POST method
2022-01-10 09:39:46 +01:00
Jean-Baptiste Bellet
2568d775ae Create the guest view and its associated css 2022-01-10 09:39:46 +01:00
Jean-Baptiste Bellet
efda693f8e Do not show tabs if the current step if the /guest step 2022-01-10 09:39:46 +01:00
Jean-Baptiste Bellet
f2c3a380ac Redirect to /guest if distributor doesn't allow guest order 2022-01-10 09:39:46 +01:00
Jean-Baptiste Bellet
2929b6278d Redirect to /guest if no step required and no current connected user 2022-01-10 09:39:45 +01:00
Matt-Yorkley
f23a12020c Merge pull request #8675 from Matt-Yorkley/dead-code-spree-js
Remove unused JS
2022-01-07 14:29:24 +00:00
Filipe
6f47619c5a Merge pull request #8659 from openfoodfoundation/dependabot/npm_and_yarn/jquery-ui-1.13.0
Bump jquery-ui from 1.10.4 to 1.13.0
2022-01-06 12:28:34 +00:00
Matt-Yorkley
49ab74e472 Remove unused JS 2022-01-05 15:25:55 +00:00
Matt-Yorkley
9aa6e79f2f Merge pull request #8661 from SuprajaRamesh/fixing-missing-translation
Fixing missing translation for "Are you sure?" when deleting a product
2022-01-05 15:08:45 +00:00
Matt-Yorkley
9956d627fa Use fixed theme 2022-01-04 19:41:42 +00:00
Matt-Yorkley
d00992c26c Import additional jquery-ui files 2022-01-04 19:41:42 +00:00
Matt-Yorkley
3ad17aedd4 Merge pull request #8634 from Matt-Yorkley/order-tokens
Clarify use of order tokens
2022-01-04 13:05:41 +00:00
Matt-Yorkley
312cc3fc25 Update import of changed stylesheet filename 2022-01-04 12:47:17 +00:00
Filipe
13d04c367d Merge pull request #8636 from Matt-Yorkley/stripe-auth-emails
Stripe auth email sending; quick tidy up
2022-01-04 11:01:47 +00:00
Matt-Yorkley
39f0f56af7 Rename admin css pack
It looks like Webpacker can get confused sometimes when packs with different formats have the same name (eg: admin.js and admin.scss)...
2022-01-04 10:27:10 +00:00
SuprajaR
f3f7fba855 Replacing text with translation 2022-01-03 22:28:56 +05:30
Matt-Yorkley
f4262421a8 Fix capture styles 2022-01-03 14:07:33 +00:00
Matt-Yorkley
01f25cbd13 Move more assets after rebase 2021-12-27 17:45:06 +00:00
Matt-Yorkley
2586ddc5ac Fix a CSS compiling issue after rebase 2021-12-27 17:45:06 +00:00
Matt-Yorkley
eb224ec033 Move new CSS file after rebase 2021-12-27 17:45:06 +00:00
Matt-Yorkley
afd381cbad Require fonts explicitly 2021-12-27 17:45:06 +00:00
Matt-Yorkley
469c4e69e0 Update broken variable reference
The previous font variable is only present in admin css
2021-12-27 17:45:06 +00:00
Matt-Yorkley
959c89a3ec Move new image 2021-12-27 17:45:06 +00:00
Matt-Yorkley
8a34e8e762 Move new scss files 2021-12-27 17:45:06 +00:00
Matt-Yorkley
1ff75ee642 Update preloaded font path 2021-12-27 17:45:06 +00:00
Matt-Yorkley
19fc4993d5 Delete unused Spree logo 2021-12-27 17:45:06 +00:00
Matt-Yorkley
aa6a4925ac Update default images paths for logos 2021-12-27 17:45:06 +00:00
Matt-Yorkley
16c6155b14 Use old image tag in Angular template files
Angular templates apparently don't work with Webpacker... :/
2021-12-27 17:45:06 +00:00
Matt-Yorkley
9e6082f0cf Use old image tag for non-compiled images 2021-12-27 17:45:06 +00:00
Matt-Yorkley
f2fc100b5f Replace #image_path helper calls with #image_pack_path 2021-12-27 17:45:06 +00:00
Matt-Yorkley
2888d75cd3 Replace #image_tag helper calls with #image_pack_tag 2021-12-27 17:45:06 +00:00
Matt-Yorkley
12f51febd3 Enable Webpack compiling for all images 2021-12-27 17:45:06 +00:00
Matt-Yorkley
31276ff3f5 Remove images and fonts from app/assets 2021-12-27 17:45:06 +00:00
Matt-Yorkley
a11aebb2ca Update stylesheets loaded with wicked-pdf to use Webpack
Luckily wicked-pdf already has a corresponding helper method.
2021-12-27 17:45:06 +00:00
Matt-Yorkley
90956c9d10 Switch mail CSS to Webpacker 2021-12-27 17:45:06 +00:00
Matt-Yorkley
250f0c0a65 Bring in missing select2 image
This missing image was previously ignored, but now causes a compile error when not found.
2021-12-27 17:45:06 +00:00
Matt-Yorkley
0e4d77a1bc Move current select2-rails gem stylesheet to /vendor
This version isn't available via npm and we can't load it from the gem any more as we move to Webpack assets.

As a side note: I think we'll need to replace Select2 soon anyway, so we can delete this once we've done that.
2021-12-27 17:45:06 +00:00
Matt-Yorkley
80be57a777 Install select2 via yarn and import CSS from node_modules 2021-12-27 17:45:06 +00:00
Matt-Yorkley
74bed15f7f Fix crazy issue with @extend on icons
This one line of code was crashing asset compilation... :/
2021-12-27 17:45:06 +00:00