raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-05 22:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,608 Commits 18 Branches 452 Tags
20c41ce69e04299a6bf821094de21f63f678dcc2
Commit Graph

15608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt-Yorkley
3e39f3e749 Disable logout on password change 2018-10-08 23:06:54 +01:00
Matt-Yorkley
8f5fd41c8b Update email confirmation address 2018-10-08 21:38:47 +01:00
Matt-Yorkley
3ec8c12899 Update account setting spec for updating email address 2018-10-08 20:41:59 +01:00
Pau Pérez Fabregat
2aeed9763c Merge pull request #2789 from luisramos0/pending_order_syncer 
[Spree Upgrade] Making broken OrderSyncerSpec tests pending, 9 tests to be fixed in issue #2788
 2018-10-08 17:51:36 +02:00
Pau Pérez Fabregat
c30458b90a Merge pull request #2787 from luisramos0/pending_subs_mailer 
[Spree Upgrade] Making SubsMailerSpec pending, 21 tests to be fixed in issue #2786
 2018-10-08 17:51:24 +02:00
Pau Pérez Fabregat
875f0c01bc Merge pull request #2794 from luisramos0/pending_bulk_prod_update 
[Spree Upgrade] Making BulkOrderUpdateSpec pending, 33 out of 34 tests to be fixed in #2790
 2018-10-08 17:51:08 +02:00
Pau Pérez Fabregat
d2720652bb Merge pull request #2795 from luisramos0/pending_subs_pacement_job 
[Spree Upgrade] Making SubsPlacementJobSpec pending, 6 tests to be fixed in issue #2793
 2018-10-08 17:50:58 +02:00
Pau Pérez Fabregat
b51bd4aa4b Merge pull request #2796 from luisramos0/pending_prod_import 
[Spree Upgrade] Making product import and product importer specs pending, 17 tests to be fixed in #2791
 2018-10-08 17:50:48 +02:00
Pau Pérez Fabregat
86d9f4d56a Merge pull request #2797 from luisramos0/pending_reports 
[Spree Upgrade] Making reports and reports_controller specs pending, 18 tests to be fixed in #2792
 2018-10-08 17:50:25 +02:00
Pau Pérez Fabregat
ea6e522775 Merge pull request #2826 from 73VW/master 
[README] Updated build status badge
 2018-10-08 17:47:52 +02:00
Pau Pérez Fabregat
f5573f419b Merge pull request #2778 from coopdevs/refactor-entry-processor 
Refactor entry processor
 2018-10-08 17:11:23 +02:00
Matt-Yorkley
37a7cceead Fix bindings on angular orders data 2018-10-08 15:42:46 +01:00
Matt-Yorkley
b78716c283 Fix missing local variable 2018-10-08 14:49:29 +01:00
Maikel
d15f524cb1 Merge pull request #2779 from luisramos0/2-0-shipment-specs 
[Spree Upgrade] Fixed several specs by defining line_items.target_shipmnt
 2018-10-08 17:43:54 +11:00
Transifex-Openfoodnetwork
8b59943256 Updating translations for config/locales/de_DE.yml 2018-10-08 16:58:01 +11:00
luisramos0
574f031020 Fix typo in matomo optout iframe url in cookies_policy_helper 2018-10-05 21:36:03 +01:00
Kristina Lim
da904c908d Fix product import date when not all variants have it 2018-10-06 03:03:22 +08:00
Pau Pérez Fabregat
58a99a7f89 Merge pull request #2692 from Matt-Yorkley/bi/angular_orders 
Angularise orders page
 2018-10-04 21:10:48 +02:00
73VW
7a1cffb4b5 Updated build status badge 2018-10-04 18:43:30 +02:00
Pau Pérez Fabregat
b139f3839a Merge pull request #2806 from luisramos0/rep 
Delete representative_view dependency, not used
 2018-10-04 13:02:35 +02:00
niko
f99ed81863 Make 'Clear All' button work on order cycle page 2018-10-04 11:46:38 +02:00
niko
f65d3c2815 fix rubocop issue 2018-10-04 03:30:32 +02:00
niko
3ae38178a3 Move query from variant_overrides_controller to its model scope 2018-10-04 02:43:02 +02:00
Pau Perez
f8ec198f9f Remove on_demand from Api::CachedProductSerializer 
This fixes lots of specs like the whole
spec/controllers/shop_controller_spec.rb, almost all specs of
spec/lib/open_food_network/products_renderer_spec.rb and most of
spec/features/consumer/shopping/shopping_spec.rb.
 2018-10-03 14:27:59 +02:00
Pau Perez
75ad4254a6 Remove on_demand from Api::Admin::ProductSerializer 
This change also moves the spec file to its appropriate place for the
sake of consistency and RSpec3-izes the test example.
 2018-10-03 13:06:13 +02:00
luisramos0
8a22567291 Fix enterprise fee calculation. The adjustment.source value of the fee is now allowing the inheritance of the tax category from line items 2018-10-02 23:44:38 +01:00
luisramos0
1ce431b671 Reorganize code in EnterpriseFeeApplicator 2018-10-02 23:39:31 +01:00
luisramos0
3fbb98519d Adapt tax_rate_decorator to new spree version. Spree's default tax calculator now is checking line_items tax category, not the product tax category. See Spree's change here: a0a4b91f13 (diff-46e557ca8717d6ab5039470a40d00ea8) 2018-10-02 23:28:47 +01:00
dependabot[bot]
8a6da745a3 Bump rspec-retry from 0.5.6 to 0.6.1 
Bumps [rspec-retry](https://github.com/noredink/rspec-retry) from 0.5.6 to 0.6.1.
- [Release notes](https://github.com/noredink/rspec-retry/releases)
- [Changelog](https://github.com/NoRedInk/rspec-retry/blob/master/changelog.md)
- [Commits](https://github.com/noredink/rspec-retry/compare/v0.5.6...v0.6.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-02 19:15:12 +00:00
dependabot[bot]
4e1521fd6a Bump haml from 4.0.4 to 4.0.7 
Bumps [haml](https://github.com/haml/haml) from 4.0.4 to 4.0.7.
- [Release notes](https://github.com/haml/haml/releases)
- [Changelog](https://github.com/haml/haml/blob/master/CHANGELOG.md)
- [Commits](https://github.com/haml/haml/compare/4.0.4...4.0.7)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-02 19:13:34 +00:00
luisramos0
c559cf0394 Fix Shipment adjustments specs on adjustment_spec by setting Config values before test objects are created 2018-10-02 16:17:26 +01:00
luisramos0
bed4ec4102 Improve docs and readability on tax_rate_decorator 2018-10-02 16:15:10 +01:00
luisramos0
795441484d Fix shipping adjustment basic test in adjustment_spec by removing extra shipping_method from test shipment 2018-10-02 16:15:00 +01:00
luisramos0
daafe73d81 Delete representative_view dependency, not used 2018-10-02 15:11:13 +01:00
Pau Pérez Fabregat
aa78b9e54c Merge pull request #2777 from coopdevs/setup-simplecov 
Setup simplecov
 2018-10-02 14:39:43 +02:00
Pau Pérez Fabregat
6ddcb01b7c Merge pull request #2736 from openfoodfoundation/dependabot/bundler/oj-3.6.10 
Bump oj from 2.1.2 to 3.6.10
 2018-10-02 14:38:26 +02:00
Matt-Yorkley
55d7d5d1e4 Rename #capture_path to #payment_capture_path 2018-10-02 11:10:51 +01:00
Matt-Yorkley
017e3d14df Use variable colour assignment 2018-10-02 11:10:21 +01:00
Pau Perez
6a7359a3c5 Pass supplier_ids in strategy #reset instead 
This removes the need to expose supplier_ids through #<< and makes both
ResetAbsent and its strategies simpler.

This could be made even simpler if the strategies just implemented
`#relation` as public method and ResetAbsent called `#update_all` on
them. The data to be fetched is the only thing that changes but the
update is the same.
 2018-10-01 17:37:49 +02:00
Pau Perez
82654cd1ee Turn delegation to a reader to make it simpler 
This makes the solution less smart and as a result ResetAbsent improves
it's consistency and returns always an integer.
 2018-10-01 16:40:34 +02:00
Pau Perez
148321f7b7 Make strategies class names more explicit 2018-10-01 16:40:34 +02:00
Pau Perez
af93af1a64 Replace strategy with a more explicit name 2018-10-01 16:40:34 +02:00
Pau Perez
8715fce295 Remove @import_settings in favor of Settings 2018-10-01 13:12:06 +02:00
Pau Perez
fd69c7672d Add specs for ResetAbsent strategies 
This also fixes the case where there are no overrides to exclude.
 2018-10-01 13:12:06 +02:00
Pau Perez
d527f6265a Remove pointless sum 2018-10-01 13:12:06 +02:00
Pau Perez
5eb10edbfd Inject #updated_ids to strategy 
Their values are known beforehand.
 2018-10-01 13:12:06 +02:00
Pau Perez
186801a1e2 Remove unused supplier_ids argument 2018-10-01 13:12:06 +02:00
Pau Perez
718f529ede Use nested module in test to improve readability 2018-10-01 13:12:06 +02:00
Pau Perez
f04fa4ed63 Do not treat ResetAbsent as a decorator anymore 
This fully encapsulates it's logic and reduces its tight coupling with
EntryProcessor.
 2018-10-01 13:12:06 +02:00
Pau Perez
95ae18a1ba Remove method delegation 2018-10-01 13:12:06 +02:00