17898 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Luis Ramos	09aef524f3	Make route helpers use spree helper	2020-11-04 12:15:45 +00:00
Luis Ramos	805b4d243e	Fix missing translations	2020-11-04 12:15:45 +00:00
Luis Ramos	a07029f660	Add require so that model is available when needed	2020-11-04 12:15:45 +00:00
Luis Ramos	ccab133d63	Make sample data use OFN's calculators	2020-11-04 12:15:45 +00:00
Luis Ramos	a51645f316	Remove deleted file	2020-11-04 12:15:45 +00:00
Luis Ramos	4125fe1690	Fix problem with string matchers	2020-11-04 12:15:45 +00:00
Luis Ramos	6950d7717f	Add missing translation	2020-11-04 12:15:45 +00:00
Luis Ramos	ab53db0c61	Merge ability and ability decorator	2020-11-04 12:15:45 +00:00
Luis Ramos	1b4a4a8113	Bring code from spree_paypal_express to make it use spree url_helper	2020-11-04 12:15:45 +00:00
Luis Ramos	66fb3a9cf3	Remove code related to spree promotions	2020-11-04 12:15:45 +00:00
Luis Ramos	79a7cf9b39	Add default spree logo	2020-11-04 12:15:45 +00:00
Luis Ramos	a18a198812	Fix locations of requires in admin js all.js	2020-11-04 12:15:45 +00:00
Luis Ramos	0ca71ce0a9	Do not reload routes and make spree routes append instead of draw in ... case thee routes are already defined elsewhere, for example, by the paypal express gem	2020-11-04 12:15:45 +00:00
Luis Ramos	b7aa04353c	Fix requires of product duplicator	2020-11-04 12:15:45 +00:00
Luis Ramos	bfeebccbc5	Load Spree engine before configuring it	2020-11-04 12:15:45 +00:00
Luis Ramos	4b21667974	Move initializers from Spree engine to the OFN application	2020-11-04 12:15:45 +00:00
Luis Ramos	9bbeec5031	Require code from spree/core explicitly	2020-11-04 12:15:45 +00:00
Luis Ramos	af3057f55f	Remove spree requires that are not needed in OFN	2020-11-04 12:15:45 +00:00
Luis Ramos	e8381304f9	Remove spree_core dependency	2020-11-04 12:15:45 +00:00
Luis Ramos	58a476751b	Remove code from the spree engine that is not needed in OFN	2020-11-04 12:15:45 +00:00
Luis Ramos	3320a3f0bc	Fix some more rubocop issues	2020-11-04 12:15:45 +00:00
Luis Ramos	4c6708267a	Run rubocop -a	2020-11-04 12:15:45 +00:00
Luis Ramos	2f0d61d54f	Bring Spree engine.rb from spree_core	2020-11-04 12:15:45 +00:00
Luis Ramos	451d8488d9	Run rubocop -a	2020-11-04 12:15:45 +00:00
Luis Ramos	bcca2eee9d	Bring user and ability related files from spree_core	2020-11-04 12:15:45 +00:00
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	f6195f1159	Remove duplicate_extra logic from ProductDuplicator	2020-11-04 12:15:23 +00:00
Luis Ramos	503c17f896	Move Spree::ProductDuplicator to Spree::Core namespace	2020-11-04 12:15:23 +00:00
Luis Ramos	795b7101ab	Remove spree requires that are not needed in OFN	2020-11-04 12:15:23 +00:00
Luis Ramos	9d4a15b0e0	Add required product scopes from spree_core product_scopes	2020-11-04 12:15:23 +00:00
Luis Ramos	459959c068	Remove code related to spree promotions	2020-11-04 12:15:23 +00:00
Luis Ramos	ba16de6627	Move product duplicator to lib/spree/core, it's where spree_core is currently loading it from	2020-11-04 12:15:23 +00:00
Luis Ramos	72a39fdf54	Add required factory from spree_core	2020-11-04 12:15:23 +00:00
Luis Ramos	4b8515358c	Remove reference to FactoryGirl, it's FactoryBot that is used in OFN	2020-11-04 12:15:23 +00:00
Luis Ramos	cf7d8067df	Fix easy rubocop issues	2020-11-04 12:15:23 +00:00
Luis Ramos	d4e4669e49	Run transpec	2020-11-04 12:15:23 +00:00
Luis Ramos	e9f76cb339	Remove some dead code (Config.track_inventory_levels), remove variant.cost_price= so that localized number is seen, and fix specs	2020-11-04 12:15:23 +00:00
Luis Ramos	b68c5ee0f9	Remove dead code (prototypes) and fix specs	2020-11-04 12:15:23 +00:00
Luis Ramos	072cd2bd54	Run rubocop autocorrect in specs	2020-11-04 12:15:23 +00:00
Luis Ramos	2f8198eecc	Fix some easy rubocop issues	2020-11-04 12:15:23 +00:00
Luis Ramos	f85044e035	Run rubocop autocorrect	2020-11-04 12:15:23 +00:00
Luis Ramos	751beceb34	Merge decorators with original spree files	2020-11-04 12:15:23 +00:00
Luis Ramos	8cb75fc6d8	Bring models from spree_core: Spree::Product and Spree::Variant! ... EPIC COMMIT ALERT :-)	2020-11-04 12:15:23 +00:00
Pau Pérez Fabregat	201c9c109d	Merge pull request #6281 from Matt-Yorkley/missing-translation-ordering ... Add missing translation key for enterprise taxon ordering	2020-11-02 22:15:43 +01:00
Pau Pérez Fabregat	4911bb6613	Merge pull request #6274 from luisramos0/rubocop ... Use rubocop auto correct to fix a number of issues	2020-11-02 22:13:36 +01:00
Pau Pérez Fabregat	9de74500cd	Merge pull request #6288 from andrewpbrett/fix-cookies-banner ... update template path for cookies banner, fix #6284	2020-11-02 20:52:46 +01:00
Andy Brett	04f5249176	update template path for cookies banner, fix #6284	2020-11-02 07:45:30 -08:00
Luis Ramos	1bb7fd9ec8	Merge pull request #6280 from Matt-Yorkley/eastern-slavic-plurals ... Add missing translation keys for Eastern Slavic plurals	2020-10-31 23:13:54 +00:00
Matt-Yorkley	0af20e48b0	Add missing translation key for enterprise taxon ordering	2020-10-31 19:17:19 +00:00
Matt-Yorkley	bc40088eaf	Add missing translation keys for Eastern Slavic plurals ... There are multiple forms of pluralisation here, with different translations for each. перевод сложен !	2020-10-31 16:58:15 +00:00