1302 Commits

Author	SHA1	Message	Date
Cillian O'Ruanaidh	a9664e103d	Merge latest :master into :drop-blockenspiel branch and resolve conflicts related to Rubocop fixes.	2020-06-29 18:11:08 +01:00
Luis Ramos	0e3b5ad4c3	Revert rubocop auto correct because update! is a method in the adjustment model	2020-06-22 17:39:17 +01:00
Luis Ramos	41ff406e86	Fix rubocop issue by avoiding rails method name update_attributes	2020-06-22 16:51:46 +01:00
Luis Ramos	f848a89a00	Rename update_attributes to update #rails4	2020-06-22 16:51:43 +01:00
Luis Ramos	adfe1f89b6	Revert previous rubocop auto correct fix that breaks the cart spec	2020-06-22 13:08:38 +01:00
Luis Ramos	8a9dae0ee2	Run rubocop autocorrect ... This is the result of bundle exec rubocop --auto-correct	2020-06-22 12:23:10 +01:00
Pau Pérez Fabregat	db80992326	Merge branch 'master' into drop-blockenspiel	2020-06-19 12:12:10 +02:00
François Turbelin	6672cfdaf5	Readd price_adustments after bad rebase	2020-06-16 16:13:56 +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
Pau Perez	456f369b76	Fix outstanding Rubocop violations	2020-06-15 10:17:34 +02:00
Cillian O'Ruanaidh	430e5ea9cc	Permission to view :bulk_coop report is now added in the #add_bulk_coop_abilities method.	2020-06-13 16:57:43 +01:00
Cillian O'Ruanaidh	c1e57fcc12	Adjust CanCan ability to reflect that the bulk coop report now runs from the order management engine.	2020-06-13 15:41:09 +01:00
Luis Ramos	983bed3c4e	Merge branch 'master' into 3-0-stable-jun-2	2020-06-11 19:50:56 +01:00
Pau Pérez Fabregat	bc8a10c6a0	Merge pull request #5541 from luisramos0/has_variants ... Delete dead code related to products without variants	2020-06-11 15:18:13 +02:00
Pau Pérez Fabregat	246a4995cb	Merge pull request #5490 from luchiago/change-price-sack-amount-int-to-float ... Change minimal amount in price sack calculator to float	2020-06-11 12:42:11 +02:00
Luis Ramos	28f126eed1	Merge pull request #5545 from mbudm/task/matomo-tag-manager ... Add configuration to enable Matomo Tag Manager	2020-06-10 20:49:34 +01:00
Steve Roberts	5fcc0dcd14	Add configuration to enable matomo tag manager ... - Update embed codes and allow both scripts concurrently - Add lines around blocks - Update MTM copy based on PR feedback - checked cookies unchanged	2020-06-09 10:21:11 +10:00
Matt-Yorkley	9e278d5b2f	Improve performance in various reports	2020-06-05 16:39:01 +02:00
Lucas Hiago	bfe17f54d7	Change minimal amount in price sack calculator to float	2020-06-03 08:51:41 -03:00
Luis Ramos	c9a7a6e897	Merge branch 'master' into 3-0-stable-jun-2	2020-06-02 16:00:45 +01:00
Luis Ramos	e7828e107b	Delete dead methods from product_decorator	2020-06-01 14:07:34 +01:00
Pau Pérez Fabregat	c0ad992352	Merge pull request #5465 from luisramos0/rename_accessible_by ... [Rails 4.1] Rename order_cycle.accessible_by to remove name clash with active record	2020-05-29 12:04:19 +02:00
Luis Ramos	f34f693620	Merge branch 'master' into 3-0-stable-may-22	2020-05-22 22:54:19 +01:00
Pau Pérez Fabregat	3f593d6246	Merge pull request #5440 from luisramos0/grumpy_cat ... Fix Grumpy Cat on shop page (cart with items from a closed OC)	2020-05-22 18:38:41 +02:00
Luis Ramos	758d7c82f7	Rename order_cycle.accessible_by to remove name clash with active record	2020-05-19 12:21:13 +01:00
Luis Ramos	37350fcbb0	Add table name to condition so it doesnt cause trouble in the future if mixed with other tables in the same query	2020-05-18 10:55:03 +01:00
Luis Ramos	6827ce5c7f	Refactor order.set_order_cycle, return early and remove indentation	2020-05-15 19:29:37 +01:00
Luis Ramos	19da0ba969	Merge branch 'master' into 3-0-stable-may13	2020-05-13 19:50:32 +01:00
Luis Ramos	0a6bd1424c	Make ship method display on back_end work correcly by making checkout ignore ship methods configured for backoffice only ... Adding both unit and feature tests as this is important enough for that	2020-05-08 12:59:17 +01:00
Luis Ramos	d967d855fc	Merge pull request #5319 from Matt-Yorkley/caching-by-class ... [Caching] Caching data by class	2020-05-07 11:43:44 +01:00
Luis Ramos	be4104d6f3	Merge branch 'master' into 3-0-stable-may-5	2020-05-05 19:11:20 +01:00
Matt-Yorkley	6afda87baf	Add explanatory comment on soft-deleted variant stock logic	2020-05-05 13:57:50 +02:00
Matt-Yorkley	0e429da377	Return zero available stock (total_on_hand) for variants that are soft-deleted	2020-05-05 13:57:50 +02:00
Matt-Yorkley	068c8feea7	Merge pull request #5289 from Matt-Yorkley/cart-populate ... Cart populate	2020-05-05 13:56:17 +02:00
Pau Pérez Fabregat	f9f4bdae8f	Merge pull request #5238 from Matt-Yorkley/moar-performance ... Improve Pain Points	2020-04-29 16:36:15 +02:00
Matt-Yorkley	f4bcf6c6d5	Eager-load line_item associations in order	2020-04-28 20:10:40 +02:00
Matt-Yorkley	eb5f8b85ff	Touch primary taxon when a product's primary_taxon is changed	2020-04-28 15:11:59 +02:00
Matt-Yorkley	6ef345c5d8	Touch taxon when a taxon is applied to a product	2020-04-28 15:11:59 +02:00
Luis Ramos	839b373b5c	Merge branch 'master' into 3-0-stable-Apr28	2020-04-28 13:40:19 +01:00
Matt-Yorkley	74e81b078f	Avoid N+1s in Order#cap_quantity_at_stock!	2020-04-28 01:11:28 +02:00
Luis Ramos	d8d6bad11c	Remove config and sections related to google analytics in the cookies banner and cookies page	2020-04-27 18:40:00 +01:00
Matt-Yorkley	1152f307e2	Eager-load associated line_items data in #update_distribution_charge!	2020-04-27 19:27:07 +02:00
Luis Ramos	8b5378e673	Merge pull request #5251 from luisramos0/Issue4654 ... Change Result of PriceSack Calculation from Integers to Floats, clone #4812	2020-04-27 12:36:18 +01:00
Pau Pérez Fabregat	82156e32e0	Merge pull request #4920 from luisramos0/api_var_ctrl ... Bring Spree::Variant#active from Spree so that we can improve it	2020-04-23 17:35:49 +02:00
Luis Ramos	ac6501c5d8	Merge pull request #5195 from luisramos0/prod_helper ... Delete dead code from several places...	2020-04-23 11:07:44 +01:00
Luis Ramos	43274ecb4f	Remove dead code ... Dead since https://github.com/openfoodfoundation/openfoodnetwork/pull/3305	2020-04-18 14:47:33 +01:00
Luis Ramos	437c7367db	Remove dead code	2020-04-18 14:37:07 +01:00
blainebillings	427dc54945	Change Result of PriceSack Calculation from Integers to Floats	2020-04-17 14:43:28 +01:00
Maikel	2e31f234d6	Merge pull request #5196 from Matt-Yorkley/customers-performance ... Admin Customers performance	2020-04-17 13:28:39 +10:00