raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-30 21:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,987 Commits 18 Branches 452 Tags
9abe41f6cb61ba1a16d1f7d014e6e66646df367f
Commit Graph

675 Commits

Author SHA1 Message Date
François Turbelin
9abe41f6cb Use OrderTaxAdjustmentsFetcher service 2020-06-16 14:01:27 +02:00
Luis Ramos
e2265dd165 Fix issue in product_spec 2020-06-11 20:26:57 +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
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
e7828e107b Delete dead methods from product_decorator 2020-06-01 14:07:34 +01:00
Luis Ramos
19da0ba969 Merge branch 'master' into 3-0-stable-may13 2020-05-13 19:50:32 +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
0e429da377 Return zero available stock (total_on_hand) for variants that are soft-deleted 2020-05-05 13:57:50 +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
1b18808d21 Touch ShippingMethod when it's assigned to a new distributor 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
e33de8a20e Update specs and refactor a bit 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
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
Luis Ramos
9147518422 Remove some unnecessary code 2020-04-17 14:51:06 +01:00
Luis Ramos
d23397f250 Move float test to a separate context 2020-04-17 14:49:09 +01:00
blainebillings
993a684e44 Add Price Sack Spec for Float Amounts 2020-04-17 14:43:28 +01:00
Luis Ramos
ff799b6e82 Avoid using update_attributes that save the order to the DB 2020-04-07 11:13:29 +01:00
Luis Ramos
4ceaebf098 Add order.email regexp validation and add some tests for it 2020-04-04 16:13:23 +01:00
Luis Ramos
b8f8db0341 Merge pull request #5147 from luisramos0/3-0-stable-apr3 
[Spree 2.1] Merge master into 3-0-stable
 2020-04-04 11:03:14 +01:00
Luis Ramos
384ca310a3 Merge branch 'master' into 3-0-stable-apr3 2020-04-03 18:26:26 +01:00
Luis Ramos
154e223a12 Make sure test data is available before the test 2020-04-01 10:00:07 +01:00
Luis Ramos
0c8635403a Delete dead scope in line_items 
This is not used anywhere in the code
 2020-04-01 10:00:07 +01:00
Luis Ramos
434b68b019 Merge pull request #5048 from Matt-Yorkley/3-0-user-spec 
Ensure perform_deliveries is correctly set in user email spec
 2020-03-25 11:52:43 +00:00
Pau Pérez Fabregat
87fae15434 Merge pull request #4909 from luisramos0/line_items_spec 
Adapt line_items_spec to work in the rails 4 branch as well
 2020-03-25 10:05:20 +01:00
Matt-Yorkley
e27f7a4301 Ensure perform_deliveries is correctly set when testing user confirmation emails 2020-03-25 08:42:21 +01:00
Luis Ramos
17c2f7b138 Merge pull request #4889 from luisramos0/3-0-prod-set 
[Spree 2.1] Fix ProductSet spec (1 broken spec)
 2020-03-20 19:33:19 +00:00
Luis Ramos
eccaaca907 Merge pull request #4930 from luisramos0/3-0-stable-mar6 
Merge master into 3-0-stable
 2020-03-17 14:49:30 +00:00
Luis Ramos
e4d307fe5e Remove dead code related to user management 2020-03-07 18:14:07 +00:00
Luis Ramos
0815068050 Merge branch 'master' into 3-0-stable-mar6 2020-03-06 09:20:03 +00:00
Luis Ramos
1382bb3c6b For some reason in rails 4/spree 2.1 setting the line item as adjustable on the adjustment is not enough to populate line_item.adjustments. Here we make this assignment explicit fixing the spec in rails 4 2020-03-03 15:04:51 +00:00
Luis Ramos
a508c55700 Bring TaxRate.match to OFN 
The version of this method in spree 2.1 will break our build

This way we simply bypass this fix in spree: https://github.com/spree/spree/pull/3669

We can get back to this in the future if we ever experience the mentioned bug
 2020-03-03 09:27:04 +00:00
Luis Ramos
777754f8a9 Remove dead code that creates products in product_set 2020-03-02 19:41:51 +00:00
Luis Ramos
4f3247c196 Revert "Temporarily remove broken specs" 
This reverts commit c0dc999e0d.
 2020-02-28 12:18:53 +01:00
Matt-Yorkley
f5bc120fb1 Remove without_protection: true argument from #create calls 
Needed for using Strong Parameters in Rails 4
 2020-02-22 14:35:10 +01:00
Matt-Yorkley
53645517af Update deprecated #find_by_* methods 2020-02-22 11:06:51 +00:00
luisramos0
c0dc999e0d Temporarily remove broken specs 2020-02-22 11:05:24 +00:00
Maikel Linke
30888a9e59 Stabilise spec by not creating noise data 
We were using a more complex order factory that created more data than
we needed. The order contained a second line item and therefor the
manifest had two items as well. Sometimes we would pick the wrong one.
 2020-01-22 09:49:37 +11:00
luisramos0
c59326743b Remove sales total report 2019-12-13 16:44:46 +00:00
Luis Ramos
471ec2023e Merge pull request #4426 from Matt-Yorkley/customer_totals 
Orders and Fulfilment reports
 2019-11-14 12:07:16 +00:00
Pau Perez
16f570b8f7 Temporarily disable flaky line item spec 
This is causing almost all PRs to fail in CI and blocking our delivery
pipe. We're already working on a solution in
https://github.com/openfoodfoundation/openfoodnetwork/pull/4458.
 2019-11-12 13:23:04 +01:00
Matt-Yorkley
5082a133a1 Refactor adjustment fetching into new service and module 2019-11-12 11:57:54 +00:00
Luis Ramos
3e7bd7dc19 Merge pull request #4376 from luisramos0/ghosts 
Remove product from Order Cycles if product supplier changes
 2019-10-28 21:17:48 +00:00
luisramos0
783c3c9e90 Add spec to product set to cover case where product and variants attributes are both provided and the product supplier is not, in that case, ExchangeVariantDeleter would not execute and update_product_only_attributes would return nil cancelling update_product_variants from being executed. Now, update_product_only_attributes always returns true if product.save suceeeds, no matter what ExchangeVariantDeleter returns 2019-10-21 14:45:27 +01:00