6953 Commits

Author	SHA1	Message	Date
Matt-Yorkley	ba0701457e	Apply distributor td override	2018-09-11 11:42:08 +01:00
Matt-Yorkley	6389c552ca	Apply distributor th override	2018-09-11 11:41:25 +01:00
Matt-Yorkley	1958ac9932	Apply distributor filter inputs override	2018-09-11 11:39:05 +01:00
Matt-Yorkley	c7e2f817ed	Apply colgroup override	2018-09-11 11:34:34 +01:00
Matt-Yorkley	5a2491cb47	Apply ng-app override	2018-09-11 11:30:14 +01:00
Matt-Yorkley	980c46c63f	Convert Spree view to HAML	2018-09-11 11:22:54 +01:00
Maikel Linke	13b9ecab21	Fix font issue in mobile menu	2018-08-31 11:23:11 +10:00
luisramos0	1b4e0cd73a	Made the menu config default values more user friendly	2018-08-31 11:23:11 +10:00
luisramos0	e573a3fc2b	The main menu is now translatable and configurable using Content configuration and translations. Added 7 menu entries to the translations file (each with text and url) and 7 content configuration points to enable/disable these. The mobile menu icons can also be configured.	2018-08-31 11:23:11 +10:00
Maikel	1b88edea1f	Merge pull request #2420 from stveep/stripe-admin-2 ... Stripe admin 2	2018-08-30 15:48:49 +10:00
Maikel Linke	d1f7828432	Fix pending spec ... The link from the enterprise page was missing the enterprise id. So the bulk edit page for fees was showing fees for all enterprises.	2018-08-30 14:50:41 +10:00
Maikel Linke	0174b84254	Remove old deactivated code	2018-08-30 14:50:41 +10:00
Maikel	79f50e0b7b	Merge pull request #2353 from luisramos0/customers_admin_country_state ... fixed UX problem in the state selector in customers admin	2018-08-28 16:46:00 +10:00
Maikel	8eee8f96ed	Merge pull request #2557 from Matt-Yorkley/pi/class_descriptions ... Class descriptions for Product Import	2018-08-24 18:14:12 +10:00
Matt-Yorkley	717f626dfe	Refactor enterprise validation	2018-08-24 15:51:37 +10:00
Matt-Yorkley	2b057a26d5	Add primary_producer to index to reduce queries	2018-08-24 15:51:37 +10:00
Matt-Yorkley	666fbf53bf	Validate enterprise.is_primary_producer?	2018-08-24 15:51:37 +10:00
Maikel	616b42a14d	Merge pull request #2555 from luisramos0/cookie_http_only ... Added httponly to cookieConsent cookie, this makes this cookie secure…	2018-08-24 15:50:13 +10:00
Maikel	a37931afda	Merge pull request #2542 from luisramos0/add_to_cart ... Extract OrderController.populate to new CartController and OrderPopulator to new CartService	2018-08-24 14:43:33 +10:00
Maikel	bf55190136	Merge pull request #2546 from Matt-Yorkley/pi/sku_validation ... Remove empty SKU values if empty	2018-08-24 14:32:00 +10:00
Maikel	871e423e12	Merge pull request #2548 from kristinalim/feature-bulk_update_of_order_cycle_name ... Make OC name editable from the OC index	2018-08-24 11:38:31 +10:00
luisramos0	910297572e	Removed unnecessary currency from CartService constructor, using order.currency instead	2018-08-23 12:40:18 +01:00
luisramos0	c7b202f932	Fixed CodeClimate warnings on services/cart_services.rb	2018-08-23 12:39:58 +01:00
luisramos0	05bfc098ff	/controllers/spree/order_populator_decorator (with a class_eval) is now /services/CartService with no dependency to Spree::OrderPopulator.	2018-08-23 12:39:55 +01:00
luisramos0	6caa361354	Moved Spree::OrderController.populate to new CartController. ... This was done to make order populate independent of Spree::OrdersController	2018-08-23 12:37:52 +01:00
Maikel	4417a8f156	Merge pull request #2539 from luisramos0/delete_dead_cart ... removed Cart route, controller, model and specs: dead code	2018-08-22 17:35:58 +10:00
luisramos0	61f69905f8	fixed UX problem in the state selector in customers admin	2018-08-20 20:51:22 +01:00
stveep	17f2ba47ca	Add label for card field	2018-08-19 12:00:31 +01:00
stveep	8c6b8d5e84	Move injectors outside Stripe partial to satisfy dependencies	2018-08-19 11:50:34 +01:00
stveep	286101c934	PR changes: switch syntax for mapCC, remove ng-init	2018-08-19 10:43:53 +01:00
stveep	c0f41b6833	PR changes - erb to haml, don't update en_GB translations	2018-08-19 10:43:53 +01:00
stveep	b3da7049c6	Should not hide post code on admin side as no billing address otherwise	2018-08-19 10:43:53 +01:00
stveep	ff7dc811e9	Add translations for messages and remove old placeholder translation	2018-08-19 10:43:53 +01:00
stveep	f9a221e2ff	add to manifest, tidy up requirements, hide postcode similar to frontend	2018-08-19 10:43:53 +01:00
stveep	a848b9172e	Change name to AdminStripeElements to avoid confusion; add status bar for StatusMessages	2018-08-19 10:43:53 +01:00
stveep	8272aebe29	Add Stripe form and duplicate Stripe Elements in backend Angular app	2018-08-19 10:43:53 +01:00
Matt-Yorkley	fbbbc93aba	Class descriptions for Product Import	2018-08-18 11:42:02 +01:00
luisramos0	56879377d5	Added httponly to cookieConsent cookie, this makes this cookie secure, cannot be altered by javascript	2018-08-17 22:57:57 +01:00
Matt-Yorkley	28b1fc076a	Remove empty SKU values if empty	2018-08-16 14:29:50 +01:00
Kristina Lim	c14e7ea8d5	Allow bulk update of order cycle name	2018-08-16 21:18:24 +08:00
luisramos0	91e57cb893	Removed Cart table, its dependency on spree orders table and removed some more dead code related to this	2018-08-15 23:29:28 +01:00
Maikel Linke	c9862535f8	Import required colour definitions in SCSS ... This avoids asset compile errors like this one: Sass::SyntaxError: Undefined variable: "$disabled-light".	2018-08-14 10:01:48 +10:00
luisramos0	8681618490	Fixed CodeClimate scss feedback on cookies banner and policy page css	2018-08-14 10:01:48 +10:00
luisramos0	ccd5147b11	Added angular templates route and controller to serve angular templates from the server, instead of precompiled assets. This was used to fix a problem with the cookies policy page template that was using a Spree configuration	2018-08-14 10:01:48 +10:00
luisramos0	1c20967ca4	Added a button to close the cookies policy page at the bottom of the page to improve UX on mobile	2018-08-14 10:01:48 +10:00
luisramos0	4b64369ddb	Added GA and Matomo toggle in Legal Settings in the global settings in the BO and added GA and Matomo cookies details to the cookies policy page (according to what is configured in the BO)	2018-08-14 10:01:48 +10:00
luisramos0	ca35c59e52	Moved the footer TOS URL from the content settings to the new section legal settings in the global settings	2018-08-14 10:01:48 +10:00
luisramos0	d920c32376	Added cookies banner toggle and privacy URL to a new section called Legal Settings in the global settings in the BO	2018-08-14 10:01:48 +10:00
luisramos0	92f9cbd00a	Added new cookies banner (with link to cookie policy page and the accept cookies button)	2018-08-14 10:01:48 +10:00
luisramos0	08c5d8f3ab	Added new cookies policy page and added a link to it in the footer (cookies policy link)	2018-08-14 10:01:48 +10:00