raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,092 Commits 21 Branches 450 Tags
080689ccfa6197f32cef6b25dc86c5e68dfd7619
Commit Graph

907 Commits

Author SHA1 Message Date
luisramos0
07854cf372 Fix a few problems introduced by rubocop auto correct 2019-05-28 12:57:29 +01:00
luisramos0
86b0d71c7e Result of rubocop auto-correct and rebuilding rubocop_manual_todo 2019-05-28 12:57:29 +01:00
Drumstickx
414ae58cbd Rubocop changes. 2019-05-21 16:48:02 +02:00
Drumstickx
c162654757 Reduce code duplication. 2019-05-21 16:46:40 +02:00
Drumstickx
29f68ed5d8 Rubocop changes. 2019-05-21 14:51:52 +02:00
Drumstickx
2f83d02168 Reduce code duplication. 2019-05-19 22:36:55 +02:00
Drumstickx
0e6a576e33 Fix user_id IS NOT NULL check. 2019-05-19 22:05:34 +02:00
Drumstickx
4204943a7c Styling. 2019-05-19 22:04:44 +02:00
Drumstickx
1246c3b6b9 Styling. 2019-05-19 18:57:09 +02:00
Drumstickx
ec2db4dd2a Fixed sql injection vulnerability in users_and_enterprises_report. 2019-05-19 17:58:57 +02:00
Luis Ramos
3b2e614c57 Merge pull request #3734 from luisramos0/2-0-validate-distribution 
Removing a variant from OC will prevent user with that variant in the cart from checking out
 2019-05-02 16:12:41 +01:00
Luis Ramos
0f00f48f13 Merge pull request #3634 from luisramos0/2-0-fix-sample-data 
[Spree Upgrade] Fix new sample data in v2
 2019-04-11 23:07:15 +01:00
luisramos0
44b0592223 Move OrdercycleDistributedVariants from lib/open_food_network to app/services 2019-04-11 21:37:08 +01:00
luisramos0
96ee527f0c Rename distribution_change_validator to order_cycle_distributed_variants 2019-04-11 21:14:01 +01:00
luisramos0
ecc60f3b61 Merge branch 'master' into 2-0-stable-Mar29 2019-04-05 15:47:46 +01:00
luisramos0
527cfc1601 Merge branch 'master' into 2-0-stable-Mar29 2019-03-29 13:48:49 +00:00
sdbowen
0f7ef2671f Add shipping method name to orders detail report 
Added column allows users to see the shipping method of each order.
 2019-03-28 16:08:10 -06:00
luisramos0
249e2bc9e1 Merge branch '2-0-stable' into 2-0-fix-sample-data 2019-03-26 15:50:16 +00:00
Kristina Lim
807cdb4746 Code style changes for Customer Totals report 2019-03-25 07:46:32 +08:00
Kristina Lim
4a95578db2 Use name helpers in Customer Totals report 2019-03-25 07:46:31 +08:00
Kristina Lim
7c7d61fbc5 Simplify some logic for Customer Totals report 
Line items belong to a single order.
 2019-03-25 07:46:30 +08:00
Kristina Lim
c088fb9a49 Use shorter syntax for Customer Totals report 2019-03-25 07:46:30 +08:00
Kristina Lim
46e7090d11 Group report by variant and use variant SKU 
This groups the Customer Totals report by variant too (among others,
including by product), and then changes the report to use the variant
SKU not the product SKU.

This adds a spec for customer totals grouping and details, which
replaces the test specific to the SKU column.
 2019-03-25 07:45:32 +08:00
luisramos0
c1d14686a6 Merge branch 'master' into 2-0-stable-Mar22 2019-03-22 10:55:17 +00:00
Luis Ramos
8d2d5a8708 Merge pull request #3579 from luisramos0/sanitize_data 
Add sanitize and truncate data tasks
 2019-03-22 10:29:57 +00:00
luisramos0
e2f5515412 Fix sample data by setting on_demand in the product variant, setting product.on_demand is not possible in v2 2019-03-21 13:13:50 +00:00
luisramos0
88335c7f6c Fix sample data in v2 by adapting to the fact that shipping methods can now have multiple zones 2019-03-21 13:12:44 +00:00
luisramos0
98a262f86e Fix sample data in v2 by setting a Default shipping category in both products and shipping methods 2019-03-21 13:12:03 +00:00
Maikel Linke
42ee4b9f42 Remove usage of ProductDistribution which is dead 
Sample data was failing since:
https://github.com/openfoodfoundation/openfoodnetwork/pull/3570
 2019-03-21 13:11:05 +00:00
luisramos0
61433ee395 Make anonimize and truncate tasks respect rubocop rules 2019-03-21 11:16:56 +00:00
Maikel Linke
0b7192b82a Remove usage of ProductDistribution which is dead 
Sample data was failing since:
https://github.com/openfoodfoundation/openfoodnetwork/pull/3570
 2019-03-21 17:37:16 +11:00
luisramos0
3841656979 Rename data sanitize task to data anonymize 2019-03-20 11:58:26 +00:00
luisramos0
fefced5400 Improve sanitize data: keep customers connected to users and let addresses' city and zipcode remain as they are 2019-03-20 11:49:55 +00:00
Pau Pérez Fabregat
2a3a935c16 Merge pull request #3570 from luisramos0/byebye-prod-distributions 
Delete dead feature product distributions
 2019-03-20 09:01:23 +01:00
luisramos0
b148b9ae46 Remove delete addresses SQL from truncate task 2019-03-18 12:04:37 +00:00
luisramos0
60ee17204b Merge branch 'master' into 2-0-stable-Mar16 2019-03-16 16:17:38 +00:00
Pau Perez
10a79d5a65 Decouple CachedProductsRenderer from the Rails env 
This way we don't need to touch the class implementation to enable the
products cache in development. Just change the default value in
`app/models/spree/app_configuration_decorator.rb`.
 2019-03-13 19:08:46 +01:00
Pau Pérez Fabregat
13b2115a29 Merge pull request #3581 from coopdevs/cache-stylistic-improvements 
Cache stylistic improvements
 2019-03-13 19:05:38 +01:00
luisramos0
8965dedfd7 Add sanitize and truncate tasks to support loading live data into other environments safely 2019-03-13 16:08:07 +00:00
luisramos0
2401b947b9 Make load sample data rake task work without product distributions 2019-03-13 12:24:40 +00:00
luisramos0
2de6c46834 Make order.order_cycle required in cart_service. There’s no more exception for that without product_distributions. 2019-03-13 12:24:40 +00:00
Pau Pérez Fabregat
2dd55770fe Merge pull request #3569 from luisramos0/delete-more-overrides 
Delete some more dead overrides and more dead code
 2019-03-12 17:48:12 +01:00
Pau Perez
931cb89a9d Move new class to services and rename it 2019-03-11 18:28:25 +01:00
Maikel
4780a2193f Merge pull request #3209 from mkllnk/2072-test-data 
2072 New sample data for testing
 2019-03-07 08:49:12 +11:00
Pau Perez
347aa3c4ae Replace #valid_products_distributed_by by class 2019-03-06 15:06:00 +01:00
luisramos0
9644fcf67c Improve payment method factory in sample data by removing constantize 2019-03-06 10:01:17 +00:00
luisramos0
b325cea6cb Merge branch 'master' into 2-0-stable-Mar6 2019-03-06 09:19:53 +00:00
Pau Pérez Fabregat
3ddee83be5 Merge pull request #3404 from luisramos0/2-0-disable-cache 
[Spree Upgrade] Add checkbox to disable products cache
 2019-03-05 14:51:11 +01:00
luisramos0
d7bd944af3 Fix distribution_change_validator spec 2019-03-02 13:08:35 +00:00
luisramos0
351555d4e2 Remove unused methods from add_to_cart helper and distribution change validator 2019-03-02 12:55:08 +00:00