2704 Commits

Author	SHA1	Message	Date
Luis Ramos	4931edc67c	Remove code related to promotions, we dont have promotions in OFN	2020-09-05 16:38:37 +01:00
Luis Ramos	51ed9a6b78	Fix comment and point out that it's a fix to a spree issue	2020-09-05 16:38:36 +01:00
Luis Ramos	b629a4f912	Make new specs pass	2020-09-05 16:38:36 +01:00
Luis Ramos	967380c542	Fix easy rubocop issues	2020-09-05 16:38:36 +01:00
Luis Ramos	ff0aa377a1	Run rubocop autocorrect	2020-09-05 16:38:36 +01:00
Luis Ramos	da683e3ecf	Merge decorators with original code from spree_core	2020-09-05 16:38:36 +01:00
Luis Ramos	aa46a4b5da	Bring models related to taxes and adjustments from spree_core	2020-09-05 16:38:36 +01:00
Luis Ramos	d80a44ade0	Merge pull request #5867 from luisramos0/stock ... [Bye bye Spree] Bring models stock_location and stock_movement from spree_core	2020-09-03 18:35:55 +01:00
Luis Ramos	e413920335	Move both OptionValueNamer and VariantAndLineItemNaming to app/services/variant_units	2020-09-03 09:11:00 -07:00
Luis Ramos	f28241cc5e	Merge duplicate Spree::User#superadmin? into existing Spree::admin?	2020-09-02 22:41:42 +01:00
Luis Ramos	ebf4175662	MErge user class extensions into the User class	2020-09-02 22:41:39 +01:00
Luis Ramos	737fc699ed	Fix rubocop issues	2020-09-02 22:40:46 +01:00
Luis Ramos	caf61e3a7e	Run rubocop -a	2020-09-02 22:40:28 +01:00
Luis Ramos	dfa00a770a	Bring user and ability related files from spree_core	2020-09-02 22:37:27 +01:00
Luis Ramos	b36d0bc4f3	Fix easy rubocop isssues	2020-09-01 17:09:22 +01:00
Luis Ramos	5958c2f68c	Rubocop autocorrect	2020-09-01 17:09:22 +01:00
Luis Ramos	13f0a46bc2	Merge decorator with original file from spree	2020-09-01 17:09:22 +01:00
Luis Ramos	b9f7a98c46	Bring image, asset and images_helper from spree_core	2020-09-01 17:09:22 +01:00
Luis Ramos	b413f856a5	Clarify that it's a Spree issue number	2020-09-01 09:46:41 +01:00
Luis Ramos	2f93a06dd5	Run rubocop -a on files brought from spree_core	2020-09-01 09:46:41 +01:00
Luis Ramos	7ec00cf40a	Bring base files from spree_core	2020-09-01 09:45:11 +01:00
Luis Ramos	d87d5d3537	Fix stock_movement and stock_location specs brought from spree_core ... propagate_all_variants is always true in OFN	2020-09-01 09:42:24 +01:00
Luis Ramos	e0ea25b7a3	track_inventory_levels is always true in OFN	2020-09-01 09:42:24 +01:00
Luis Ramos	8f19ad0646	Delete dead code	2020-09-01 09:42:24 +01:00
Luis Ramos	e89eb8f76c	Fix simepl rubocop issues	2020-09-01 09:42:24 +01:00
Luis Ramos	0b053c18af	Merge decoorator with original file from spree	2020-09-01 09:42:24 +01:00
Luis Ramos	d13bd86e4c	Bring stocck movement and stock location from spree	2020-09-01 09:42:24 +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
Pau Pérez Fabregat	4984cc9758	Merge branch 'master' into ctry_zone	2020-08-28 09:21:57 +02:00
Luis Ramos	5b3e350204	Rename zone.country_list to zone.countries	2020-08-26 23:12:48 +01:00
Luis Ramos	53de04121c	Fix rubocop issue	2020-08-26 23:09:41 +01:00
Luis Ramos	9264badaaf	Merge pull request #5879 from luisramos0/payments ... [Bye bye Spree] Bring models payment_method, credit_card and gateway from spree_core	2020-08-26 22:09:16 +01:00
Luis Ramos	d6160b5759	Merge pull request #5758 from luisramos0/order_updater ... Bring Order Updater from spree_core	2020-08-19 20:47:27 +01:00
Luis Ramos	49a60374e6	Remove dead method in payment method, it's a scope in OFN and remove unnecessary comments about spree	2020-08-07 14:14:46 +01:00
Luis Ramos	b21a969502	Fix new credit_card_spec	2020-08-07 13:45:25 +01:00
Luis Ramos	d746ae3d9e	Fix easy rubocop issues	2020-08-07 13:28:09 +01:00
Luis Ramos	621e2a3132	Run rubocop autocorrect	2020-08-07 13:16:38 +01:00
Luis Ramos	142bab8c35	Merge decorators with original spree files	2020-08-07 13:13:43 +01:00
Luis Ramos	abaa66cc14	Bring models from spree_core	2020-08-07 13:06:16 +01:00
Luis Ramos	51a499d5c9	Revert rubocop autocorrect so that spec keeps working	2020-08-07 10:45:15 +01:00
Luis Ramos	086c521a27	Fix easy rubocop issues	2020-08-07 10:28:41 +01:00
Luis Ramos	7cefdda579	Run rubocop autocorrect	2020-08-07 10:21:09 +01:00
Luis Ramos	ba859111de	Merge decorators with original files brought from spree	2020-08-07 10:17:30 +01:00
Luis Ramos	fd9479f720	Bring modesl from spree_core	2020-08-07 10:06:08 +01:00
Luis Ramos	43e64f3555	Delete dead code	2020-08-06 01:41:28 +01:00
Luis Ramos	00ae3a25f7	Fix easy rubocop issues	2020-08-06 01:18:43 +01:00
Luis Ramos	14358256ed	Bring country, zone, state and zone_member from spree together with respective specs	2020-08-06 01:09:35 +01:00
Luis Ramos	327d6c43d9	Merge pull request #4084 from openfoodfoundation/dependabot/bundler/devise-3.5.10 ... [Security] Bump devise from 2.2.8 to 3.5.10	2020-08-01 15:55:19 +01:00
Luis Ramos	cc7363d9e7	Merge pull request #5824 from luisramos0/improve_checkout ... Reset order state to cart in case the stripe SCA authorization step fails	2020-08-01 15:53:41 +01:00