9965 Commits

Author	SHA1	Message	Date
Matt-Yorkley	2bcadd52e8	Hide "Take me shopping" button on /shop and /shops pages	2020-06-18 22:21:55 +02:00
Matt-Yorkley	387a5ec950	Implement "Take me shopping" button	2020-06-18 22:21:55 +02:00
Matt-Yorkley	10b8470e29	Set a fixed width for cart sidebar on tablet up	2020-06-18 22:21:55 +02:00
Matt-Yorkley	4acb08e52b	Update hamburger menu icon	2020-06-18 22:21:55 +02:00
Matt-Yorkley	786348bc71	Remove colon from cart total text	2020-06-18 22:21:55 +02:00
Matt-Yorkley	459e53f43d	Adjust specs for new cart display	2020-06-18 22:21:55 +02:00
Matt-Yorkley	2f2ef28351	Use links instead of buttons and fix up styles	2020-06-18 22:21:55 +02:00
Matt-Yorkley	b74b9fbd1d	Shift sidebar down vertically (below navigation) and bring navigation up (z-index)	2020-06-18 22:21:55 +02:00
Matt-Yorkley	4a0f43a831	Ensure cart item count is visible in header cart button (for screens smaller than desktop)	2020-06-18 22:21:55 +02:00
Matt-Yorkley	439674ad9c	Make cart view fullwidth on mobile	2020-06-18 22:21:55 +02:00
Matt-Yorkley	8ca0119f5d	Add empty cart feedback	2020-06-18 22:21:55 +02:00
Matt-Yorkley	95686eda78	Update translations	2020-06-18 22:21:54 +02:00
Matt-Yorkley	7efccac7bb	Add close functionality to close button	2020-06-18 22:21:54 +02:00
Matt-Yorkley	4362b8b25b	Improve line spacing on cart product list	2020-06-18 22:21:54 +02:00
Matt-Yorkley	be8c0f3600	Remove old cart dropdown view and directive	2020-06-18 22:21:54 +02:00
Matt-Yorkley	33a2dd100e	Add new layout for cart sidebar	2020-06-18 22:21:54 +02:00
Matt-Yorkley	400fce8ef9	Separate cart page and cart dropdown styles	2020-06-18 22:21:54 +02:00
Matt-Yorkley	b4e5542e5f	Extract re-usable sidebar styes	2020-06-18 22:21:54 +02:00
Matt-Yorkley	a8b981e9cd	Add product thumbnais to serializer for cart dropdown images	2020-06-18 22:21:54 +02:00
Matt-Yorkley	b1ce7f2c15	Simplify product naming in cart	2020-06-18 22:21:54 +02:00
Matt-Yorkley	85abfd2056	Create Cart sidebar and controller	2020-06-18 22:21:54 +02:00
Luis Ramos	208623bb0a	Merge pull request #5635 from Matt-Yorkley/map-icons ... Ensure map icon URLs are correctly generated with fingerprints	2020-06-18 18:02:47 +01:00
Matt-Yorkley	130f639b61	Rename service and use #call	2020-06-18 17:14:50 +02:00
Pau Pérez Fabregat	63f8830eba	Merge pull request #5530 from cillian/remove-spinjs ... Remove spinjs-rails dependency and use spinning-circles.svg instead.	2020-06-18 16:47:09 +02:00
Matt-Yorkley	5338e782f8	Extract serializer helper method to service so the method isn't globally available	2020-06-18 16:44:15 +02:00
Luis Ramos	66f955f00d	Merge pull request #5597 from luisramos0/bo_stripe_payments ... [Spree 2.1] Make backoffice stripe payments work in rails 4	2020-06-18 14:50:27 +01:00
Matt-Yorkley	75e57e5c2c	Call #image_path on map cluster icon	2020-06-18 14:14:41 +02:00
Matt-Yorkley	9a39cbbbc5	Convert MapConfiguration service to .js.erb.coffee	2020-06-18 14:14:41 +02:00
Matt-Yorkley	551daaadea	Use #image_path correctly on map marker icons	2020-06-18 14:14:41 +02:00
Matt-Yorkley	2143122a30	Add helper method for correctly generating with fingerprints in Serializers	2020-06-18 14:14:39 +02:00
Matt-Yorkley	7cc47d652c	Merge pull request #5624 from Matt-Yorkley/rails4-image-precompile ... v3 image precompile	2020-06-18 12:01:23 +02:00
Luis Ramos	f6e3e01a10	Extract permitted payment_source attributes from checkout to use them in the backoffice payments controller ... Add spec to verify payment source attributes are passed	2020-06-18 09:54:34 +01:00
Luis Ramos	06a37d8ff0	Merge pull request #5566 from rioug/5132-no-error-when-product-csv-malformed ... Add handling of CSV::MalformedCSVError for product_importer	2020-06-17 19:58:35 +01:00
Luis Ramos	d0bb625c19	Merge pull request #5593 from coopdevs/fix-report-order-link ... Fix link from report to order	2020-06-17 19:55:40 +01:00
Luis Ramos	5163317b10	Merge pull request #5623 from luisramos0/zones ... Make Zones editable again	2020-06-17 19:41:20 +01:00
Luis Ramos	01e27dd68c	Merge pull request #5492 from pacodelaluna/include-negative-tax-adjustments-in-sales-report ... Include adjustments with negative taxes on Sales Tax reports	2020-06-16 20:23:04 +01:00
Matt-Yorkley	add38bf550	Use #image_path helper correctly ... Paths should be relative. For example an image under `/app/assets/images/home/banner.jpg` should be: `image_path("home/banner.jpg")`	2020-06-16 18:25:13 +02:00
Matt-Yorkley	c07476e22c	Use new Rails 4 #image-url SCSS helper ... Paths should be relative. For example an image under `/app/assets/images/home/banner.jpg` should be: `image-url("home/banner.jpg")`	2020-06-16 18:25:12 +02:00
Pau Pérez Fabregat	6a31c56601	Merge pull request #5598 from luisramos0/checkout_error ... Make checkout js error handling a bit more defensive	2020-06-16 16:18:49 +02:00
François Turbelin	6672cfdaf5	Readd price_adustments after bad rebase	2020-06-16 16:13:56 +02:00
Luis Ramos	3f7fb0ecc2	Add missing permitted attributes to zones	2020-06-16 13:56:39 +01:00
Pau Perez	ff4d7fbc45	Refactor with Arel to perform a single query	2020-06-16 14:01:27 +02:00
Pau Perez	00c9dd7ece	Remove N+1 fetching order and li adjustments	2020-06-16 14:01:27 +02:00
François Turbelin	b4952dcbfb	Cosmetics	2020-06-16 14:01:27 +02:00
François Turbelin	9abe41f6cb	Use OrderTaxAdjustmentsFetcher service	2020-06-16 14:01:27 +02:00
François Turbelin	c729f64fcf	Include adjustments without positive taxes	2020-06-16 14:01:27 +02:00
Luis Ramos	7db519ab62	Merge pull request #5570 from luisramos0/ship_methods_form ... [Spree 2.1] Make Shipping methods form save calculator details	2020-06-15 15:05:50 +01:00
Pau Pérez Fabregat	257b311e04	Merge pull request #5158 from openfoodfoundation/3-0-stable ... Merge 3-0-stable to master	2020-06-15 13:35:58 +02:00
Luis Ramos	538d886c83	Merge pull request #5573 from Matt-Yorkley/payment-report-500 ... Fix fatal error in reports helper for orders without payments	2020-06-15 11:27:17 +01:00
Pau Perez	456f369b76	Fix outstanding Rubocop violations	2020-06-15 10:17:34 +02:00