raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-26 20:56:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,587 Commits 18 Branches 451 Tags
2ce65472ec00195e7e89400f2e75aee99c99d2aa
Commit Graph

2420 Commits

Author SHA1 Message Date
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
Matt-Yorkley
f5ce0d501d Merge pull request #5870 from luisramos0/prefs 
[Bye bye Spree] Bring models app_configuration and preference from spree_core
 2020-10-20 21:12:54 +02: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
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
07b3c100e8 Remove code and specs related to dynamic checkout workflow, we have a static workflow defines in the Order class 2020-10-15 16:06:27 +01:00
Luis Ramos
d54ddacc05 Merge pull request #5887 from luisramos0/orders 
[Bye bye Spree] Bring models order, line_item and other related from spree_core
 2020-10-15 08:49:05 +01:00
Luis Ramos
9288250194 Merge pull request #5981 from luisramos0/spree_ability 
[Bye bye spree] Bring classes related to abilities to OFN
 2020-10-12 15:26:30 +01:00
Luis Ramos
a4c8380d7e Remove removal of transition to confirm as confirm does not exist anymore 2020-10-06 13:00:43 +01:00
Andy Brett
4f942db0ba convert entry's unscaled_units to a float 
This was coming in as a string, e.g. "1", so when we did "1" * 1000 it returned "11111111111111....." :)
 2020-09-25 09:12:19 -07:00
Luis Ramos
1b4e19b32d Remore preferences not used in OFN 2020-09-23 22:16:56 +01:00
Luis Ramos
3074d3a17a Customize some defaults to OFN 2020-09-23 22:13:36 +01:00
Luis Ramos
5bf91cb140 Remove unused spree code 2020-09-23 22:13:36 +01:00
Luis Ramos
d6862cdbce Revert rubocop autocorrect change, it breaks some of the tests 2020-09-23 22:13:36 +01:00
Luis Ramos
b9319239d5 Remove configurations that are no longer used as we have moved the code to OFN and fix specs 2020-09-23 22:13:36 +01:00
Luis Ramos
9ebb689370 Fix easy rubocop issues 2020-09-23 22:13:36 +01:00
Luis Ramos
024a64b73a Fix single rubocop rule: Use nested module definitions instead of compact style 2020-09-23 22:13:36 +01:00
Luis Ramos
25e61897aa Run rubocop autocorrect 2020-09-23 22:13:36 +01:00
Luis Ramos
ed81ceaffe Merge decorator with original file 2020-09-23 22:13:36 +01:00
Luis Ramos
8b42543ca3 Bring configuration and preferences code from spree_core 2020-09-23 22:13:36 +01:00
Andy Brett
fdb1019ee2 fix styles per rubocop 2020-09-17 16:41:49 -07:00
Andy Brett
66099239aa add translation for calculator preferred unit error 2020-09-17 08:42:08 -07:00
Andy Brett
977e4e46f3 remove explicit raise from convert_weight 2020-09-17 07:36:28 -07:00
Andy Brett
d1a87f7ba0 add oz and lb as allowed units in product import 2020-09-17 06:34:07 -07:00
Luis Ramos
455111093d Fix easy rubocop issues 2020-09-17 14:18:51 +01:00
Luis Ramos
405b317726 Merge ability and ability decorator 2020-09-17 14:18:45 +01:00
Luis Ramos
37c7d254e1 Fix rubocop issues 2020-09-17 14:10:37 +01:00
Luis Ramos
051ee0fd14 Run rubocop -a 2020-09-17 14:10:37 +01:00
Luis Ramos
c00c03737e Bring user and ability related files from spree_core 2020-09-17 14:10:37 +01:00
Luis Ramos
4b597ada12 Fix easy rubocop issues 2020-09-17 14:06:51 +01:00
Luis Ramos
e0d731b92b Remove unused email validator 2020-09-17 14:06:51 +01:00
Luis Ramos
03419bbc35 Remove all and use find_each instead! 2020-09-17 14:06:51 +01:00
Luis Ramos
7884dbfeb1 Revert rubocop autocorrect, each is needed here for find_each is not available for Arrays 2020-09-17 14:06:51 +01:00
Luis Ramos
8643cbd8ce Delete unused order.merge! and fix specs 2020-09-17 14:06:50 +01:00
Luis Ramos
2cd066237d Fix easy rubocop issues 2020-09-17 14:06:50 +01:00
Luis Ramos
94ad02abbe Run rubocop autocorrect 2020-09-17 14:06:50 +01:00
Luis Ramos
3c5a35df27 Remove original email validator and keep only previous OFN validator 2020-09-17 14:06:50 +01:00
Luis Ramos
82a116a92f We always define Spree.user_class 2020-09-17 14:06:50 +01:00
Luis Ramos
cc87e8c9a2 Remove code related to promotions 2020-09-17 14:06:50 +01:00
Luis Ramos
2a6d83b4dd Remove confirm checkout step and it's additional removal 2020-09-17 14:06:50 +01:00
Luis Ramos
6900f7a46f Merge decorators with original files from spree_core 
EPIC COMMIT ALERT :-)
 2020-09-17 14:06:50 +01:00
Luis Ramos
47d2f698ef Bring models related to Order from spree_core 
EPIC COMMIT ALERT :-)
 2020-09-17 14:05:29 +01:00
Matt-Yorkley
77eaebc2a7 Merge pull request #5888 from andrewpbrett/imperial-auto-units 
Allow US units on products/variants
 2020-09-17 15:04:15 +02:00
Luis Ramos
b84212023b Require code from spree/core explicitly 2020-09-17 13:58:10 +01:00
Luis Ramos
01daf63fc6 Fix some problems with code that was relying on spree code 2020-09-17 13:57:05 +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
Luis Ramos
87d6a73e54 Merge pull request #5878 from luisramos0/shipping 
[Bye bye Spree] Bring models shipping_method, shipping_rates, address and shipping_category from spree_core
 2020-09-16 14:58:39 +01:00
Luis Ramos
f566c2127d Merge pull request #5924 from luisramos0/basic_spree_core 
[Bye bye spree] Bring base_helper and log_entry from spree core
 2020-09-16 14:57:41 +01:00
Luis Ramos
6eb43053e9 Merge pull request #5925 from luisramos0/spree_core_user 
[Bye bye spree] Bring classes related to users to OFN
 2020-09-15 17:13:27 +01:00