2291 Commits

Author	SHA1	Message	Date
Luis Ramos	1bce516a45	Make specs load product duplicator ... This makes the ofn version of the product duplicator be used instead of the spree one	2020-11-04 12:15:45 +00:00
Luis Ramos	55e8dace44	Fix sort_by issue on relation by calling to_a	2020-10-30 10:12:56 +00:00
Luis Ramos	7b06fdd943	Convert to array before using sort_by!	2020-10-30 10:12:56 +00:00
Luis Ramos	a53223aefc	Convert relation to array before using array only method sort_by!	2020-10-30 10:10:54 +00:00
Andy Brett	57fe1db10e	guard against nil params[:available_units]	2020-10-29 09:18:24 -07:00
Andy Brett	18d2599075	indicate block argument is unused	2020-10-29 09:18:24 -07:00
Andy Brett	292b33b4ea	simplify available units params (and remove regex!)	2020-10-29 09:18:24 -07:00
Andy Brett	c9b540677c	refactor general settings controller to handle available_units params	2020-10-29 09:17:49 -07:00
Andy Brett	cb3ea133e9	add available units to instance prefs page	2020-10-29 09:17:31 -07:00
Matt-Yorkley	489529d30e	Merge pull request #5729 from luisramos0/image_settings ... Remove Image settings page and standardise Paperclip styles	2020-10-22 15:58:14 +02:00
Luis Ramos	032075c04a	Merge pull request #6119 from arku/chore/fire-event-removal ... Remove fire_event method usage	2020-10-21 21:21:35 +01:00
Luis Ramos	b267f542d1	Merge pull request #5980 from luisramos0/spree_clean_up ... [Bye bye spree] Some clean up fixes to make it all work without spree	2020-10-20 18:52:54 +01:00
Luis Ramos	0f06195baa	Remove Image settings page, these settings will come from ofn-install now	2020-10-20 11:20:37 +01:00
Arun Kumar Mohan	b0fa1464f8	Remove fire_event method usage	2020-10-18 20:36:38 -05:00
Maikel	8c65498661	Merge pull request #5998 from andrewpbrett/shipping-per-pound ... Per-pound shipping calculator	2020-10-16 15:27:57 +11:00
Luis Ramos	48ea804615	Merge pull request #6121 from cillian/fix-shop-variant-search ... When searching for shop products check the variant :display_name and :display_as fields too	2020-10-07 21:22:46 +01:00
Cillian O'Ruanaidh	6c22ee43a7	When searching for shop products check the variant :display_name and :display_as fields too. ... Fixes #5757	2020-10-02 16:05:48 +01:00
Luis Ramos	0100963a39	Delete dead code brought from spree	2020-09-26 21:16:27 +01:00
Pau Pérez Fabregat	0d259b217e	Merge pull request #6017 from Matt-Yorkley/tidyup ... Remove old code	2020-09-23 20:47:33 +02:00
Luis Ramos	a2610279d9	Merge pull request #5976 from luisramos0/address_form ... Fix address state selector and "use billing address" checkbox in order customer details page	2020-09-23 12:42:37 +01:00
Andy Brett	fdb1019ee2	fix styles per rubocop	2020-09-17 16:41:49 -07:00
Luis Ramos	1a513567f2	Fix easy rubocop issues	2020-09-17 13:59:41 +01:00
Luis Ramos	1df7890a0d	Use spree url_helpers	2020-09-17 13:59:41 +01:00
Luis Ramos	d5d62894a5	Use spree url helpers	2020-09-17 13:59:41 +01:00
Luis Ramos	a34c18451c	Add spree helper	2020-09-17 13:59:41 +01:00
Luis Ramos	27fa04114e	Add require for gateway error	2020-09-17 13:59:41 +01:00
Luis Ramos	66f27aad32	Explicitly use spree url helpers for spree routes	2020-09-17 13:59:41 +01:00
Luis Ramos	e0cb7a29bf	Add helper prefix to helper calls	2020-09-17 13:58:45 +01:00
Luis Ramos	8707f51214	Remove unused helper	2020-09-17 13:58:10 +01:00
Luis Ramos	b84212023b	Require code from spree/core explicitly	2020-09-17 13:58:10 +01:00
Luis Ramos	212820b3da	Merge pull request #5912 from luisramos0/tcs ... Terms and Conditions - upload PDF in the Enterprise Business Details and read them on Checkout	2020-09-17 12:01:45 +01:00
Luis Ramos	f1358dfa9a	Merge pull request #5722 from rioug/4206-back-from-Edit-Product-removed-filters-products-page ... 4206 back from edit product removed filters products page	2020-09-17 11:51:58 +01:00
Matt-Yorkley	7ddc53bb5b	Remove temporary debugging helpers added during the Rails 4 upgrade.	2020-09-12 12:25:43 +01:00
Andy Brett	c618ba3b2c	style fixes	2020-09-07 13:44:42 -07:00
Andy Brett	5a5cbbd318	add drop down list for unit preference	2020-09-07 13:26:09 -07:00
Andy Brett	adb29a9c8f	add preferred_unit to weight shipping calculator	2020-09-07 08:41:48 -07:00
Andy Brett	5793f0103d	Revert "Add a per-pound calculator and a spec for it" ... This reverts commit e8eadcbf39.	2020-09-07 07:50:59 -07:00
Andy Brett	e8eadcbf39	Add a per-pound calculator and a spec for it	2020-09-06 09:03:06 -07:00
Luis Ramos	9c0c324835	Add some requires now required as spree does not contain controller helpers	2020-09-04 14:30:17 +01:00
Luis Ramos	ed114f4c4c	Fix rubocop issues	2020-09-01 15:52:36 +01:00
Luis Ramos	ffa0d202be	Add states api endpoint to support existing code on the customer details page when user changes country	2020-09-01 15:46:22 +01:00
Luis Ramos	208be3ede6	Fix rubocop issues	2020-08-31 20:00:08 +01:00
Luis Ramos	66587ccc00	Allow user to remove terms and conditions file	2020-08-31 17:40:34 +01:00
Arun Kumar Mohan	bf07da6267	Fix the order resend message translation	2020-08-29 20:47:28 -05:00
Maikel	d57f20a542	Merge pull request #4925 from luisramos0/finders ... Adapt remaining AR finders to rails 4	2020-08-28 09:46:20 +10:00
Pau Pérez Fabregat	06b41a8236	Merge pull request #5908 from Matt-Yorkley/subs-logging ... Improve subs logging	2020-08-27 16:23:15 +02:00
Luis Ramos	4a5a6a2242	Merge pull request #5906 from Matt-Yorkley/checkout_flash_errors ... Fix flash error issues in checkout requests	2020-08-21 13:03:30 +01:00
Luis Ramos	d1b60e3778	Merge pull request #5905 from mkllnk/lost-decorators ... Load previously lost decorator code and don't delete orders	2020-08-21 12:34:37 +01:00
Gaetan Riou	bba683469b	add product filter parameters on the group buy options and search pages, so that the bulk import product page filters can be preserved	2020-08-21 10:39:43 +10:00
Gaetan Riou	c6e1f458cc	add product filter parameters on the various product properties pages, so that the bulk import product page filters can be preserved	2020-08-21 10:39:43 +10:00